global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-21 22:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

t6036: fix broken "merge fails but has appropriate contents" tests

Browse Source 
These tests reference non-existent object "c" when they really mean to
be referencing "C", however, these errors went unnoticed due to a broken
&&-chain later in the tests. Fix these errors, as well as the broken
&&-chains behind which they hid.

Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine
2018-07-01 20:23:49 -04:00
committed by Junio C Hamano
parent 431f4a26b5
commit f1e1239811
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t6036-recursive-corner-cases.sh
View File

@@ -506,10 +506,10 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' '
test_line_count = 2 out &&
git rev-parse >expect \
B:a E2:a/file c:a/file A:ignore-me &&
B:a E2:a/file C:a/file A:ignore-me &&
git rev-parse >actual \
:2:a :3:a/file :1:a/file :0:ignore-me &&
test_cmp expect actual
test_cmp expect actual &&
test_path_is_file a~HEAD
)
@@ -533,10 +533,10 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' '
test_line_count = 2 out &&
git rev-parse >expect \
B:a E2:a/file c:a/file A:ignore-me &&
B:a E2:a/file C:a/file A:ignore-me &&
git rev-parse >actual \
:3:a :2:a/file :1:a/file :0:ignore-me &&
test_cmp expect actual
test_cmp expect actual &&
test_path_is_file a~D^0
)