{"thread":{"id":"22421","subject":"[PATCH] tests: update tests that used to fail","startedAt":"2010-01-28T08:42:31Z","lastAt":"2010-01-28T08:42:31Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"132865","messageId":"7vtyu6mxhk.fsf@alter.siamese.dyndns.org","threadId":"22421","inReplyTo":null,"subject":"[PATCH] tests: update tests that used to fail","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-01-28T08:42:31Z","receivedAt":"2010-01-28T08:42:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"diff --cc\" output t4038 tests was fixed by b810cbb (diff --cc: a lost\nline at the beginning of the file is shown incorrectly, 2009-07-22), which\nwas actually the commit that introduced this test..\n\nAn error in \"git merge -s resolve\" t6035 tests was fixed by 730f728\n(unpack-trees.c: look ahead in the index, 2009-09-20).\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n t/t4038-diff-combined.sh        |    2 +-\n t/t6035-merge-dir-to-symlink.sh |    2 +-\n t/t7507-commit-verbose.sh       |    5 -----\n 3 files changed, 2 insertions(+), 7 deletions(-)\n\ndiff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh\nindex 2cf7e01..7584efa 100755\n--- a/t/t4038-diff-combined.sh\n+++ b/t/t4038-diff-combined.sh\n@@ -76,7 +76,7 @@ test_expect_success 'check combined output (1)' '\n \tverify_helper sidewithone\n '\n \n-test_expect_failure 'check combined output (2)' '\n+test_expect_success 'check combined output (2)' '\n \tgit show sidesansone -- >sidesansone &&\n \tverify_helper sidesansone\n '\ndiff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh\nindex d1b2287..3202e1d 100755\n--- a/t/t6035-merge-dir-to-symlink.sh\n+++ b/t/t6035-merge-dir-to-symlink.sh\n@@ -48,7 +48,7 @@ test_expect_success 'setup for merge test' '\n \tgit tag baseline\n '\n \n-test_expect_failure 'do not lose a/b-2/c/d in merge (resolve)' '\n+test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' '\n \tgit reset --hard &&\n \tgit checkout baseline^0 &&\n \tgit merge -s resolve master &&\n"}]}