t6036: fix broken "merge fails but has appropriate contents" tests
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>
Eric Sunshine committed
Jul 1, 2018 at 20:23 UTC
f1e123981177311d5038b033e5b1e89927e213db
1 file changed
+4
-4
t/t6036-recursive-corner-cases.sh
+4
-4
@@ -506,10 +506,10 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' '
506
test_line_count = 2 out &&
507
508
git rev-parse >expect \
509
- B:a E2:a/file c:a/file A:ignore-me &&
509
+ B:a E2:a/file C:a/file A:ignore-me &&
510
git rev-parse >actual \
511
:2:a :3:a/file :1:a/file :0:ignore-me &&
512
- test_cmp expect actual
512
+ test_cmp expect actual &&
513
514
test_path_is_file a~HEAD
515
)
@@ -533,10 +533,10 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' '
533
test_line_count = 2 out &&
534
535
git rev-parse >expect \
536
- B:a E2:a/file c:a/file A:ignore-me &&
536
+ B:a E2:a/file C:a/file A:ignore-me &&
537
git rev-parse >actual \
538
:3:a :2:a/file :1:a/file :0:ignore-me &&
539
- test_cmp expect actual
539
+ test_cmp expect actual &&
540
541
test_path_is_file a~D^0
542
)