On Tue, Jun 26, 2018 at 12:29 AM, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > These tests reference non-existent object "c" when they really mean to > be referencing "C", however, this error went unnoticed due to a broken > &&-chain later in the test. Fix these errors, as well as the broken > &&-chains behind which they hid. > > Signed-off-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx> > --- > t/t6036-recursive-corner-cases.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh > index b5621303d6..b32ff8e1db 100755 > --- a/t/t6036-recursive-corner-cases.sh > +++ b/t/t6036-recursive-corner-cases.sh > @@ -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 > ) Eek, how did that become c:a/file when it was originally C:a/file? Thanks for spotting the regression and fixing. Reviewed-by: Elijah Newren <newren@xxxxxxxxx>
