tests: update tests that used to fail
"diff --cc" output t4038 tests was fixed byb810cbb
(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 by730f728
(unpack-trees.c: look ahead in the index, 2009-09-20). Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7c3932334e
commit
df3dac3758
@ -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 &&
|
git show sidesansone -- >sidesansone &&
|
||||||
verify_helper sidesansone
|
verify_helper sidesansone
|
||||||
'
|
'
|
||||||
|
@ -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 reset --hard &&
|
||||||
git checkout baseline^0 &&
|
git checkout baseline^0 &&
|
||||||
git merge -s resolve master &&
|
git merge -s resolve master &&
|
||||||
|
Loading…
Reference in New Issue
Block a user