tests: update tests that used to fail

"diff --cc" output t4038 tests was fixed by b810cbb (diff --cc: a lost
line at the beginning of the file is shown incorrectly, 2009-07-22), which
was actually the commit that introduced this test..

An error in "git merge -s resolve" t6035 tests was fixed by 730f728
(unpack-trees.c: look ahead in the index, 2009-09-20).

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index 2cf7e01ac2c42216dc935d2d2d9dd23b7ae62c4f..7584efa36b06effd9005b8ebcc6afecec07e424b 100755 (executable)
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -76,7 +76,7 @@ test_expect_success 'check combined output (1)' '
        verify_helper sidewithone
 '
 
        verify_helper sidewithone
 '
 

-test_expect_failure 'check combined output (2)' '
+test_expect_success 'check combined output (2)' '

        git show sidesansone -- >sidesansone &&
        verify_helper sidesansone
 '
        git show sidesansone -- >sidesansone &&
        verify_helper sidesansone
 '

diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index d1b22871c40674582e6999804102afb95283b653..3202e1de6d01bf3c36e82351c7f8426cc2bb44ab 100755 (executable)
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -48,7 +48,7 @@ test_expect_success 'setup for merge test' '
        git tag baseline
 '
 
        git tag baseline
 '
 

-test_expect_failure 'do not lose a/b-2/c/d in merge (resolve)' '
+test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' '

        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve master &&
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve master &&