Merge branch 'en/t6042-insane-merge-rename-testcases'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:42 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:43 +0000 (15:30 -0700)
Various glitches in the heuristics of merge-recursive strategy have
been documented in new tests.

* en/t6042-insane-merge-rename-testcases:
  t6042: add testcase covering long chains of rename conflicts
  t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
  t6042: add testcase covering rename/add/delete conflict type

t/t6042-merge-rename-corner-cases.sh

index 661b633..07dd09d 100755 (executable)
@@ -693,4 +693,249 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
        )
 '
 
+# Testcase rad, rename/add/delete
+#   Commit O: foo
+#   Commit A: rm foo, add different bar
+#   Commit B: rename foo->bar
+#   Expected: CONFLICT (rename/add/delete), two-way merged bar
+
+test_expect_success 'rad-setup: rename/add/delete conflict' '
+       test_create_repo rad &&
+       (
+               cd rad &&
+               echo "original file" >foo &&
+               git add foo &&
+               git commit -m "original" &&
+
+               git branch O &&
+               git branch A &&
+               git branch B &&
+
+               git checkout A &&
+               git rm foo &&
+               echo "different file" >bar &&
+               git add bar &&
+               git commit -m "Remove foo, add bar" &&
+
+               git checkout B &&
+               git mv foo bar &&
+               git commit -m "rename foo to bar"
+       )
+'
+
+test_expect_failure 'rad-check: rename/add/delete conflict' '
+       (
+               cd rad &&
+
+               git checkout B^0 &&
+               test_must_fail git merge -s recursive A^0 >out 2>err &&
+
+               # Not sure whether the output should contain just one
+               # "CONFLICT (rename/add/delete)" line, or if it should break
+               # it into a pair of "CONFLICT (rename/delete)" and
+               # "CONFLICT (rename/add)"; allow for either.
+               test_i18ngrep "CONFLICT (rename.*add)" out &&
+               test_i18ngrep "CONFLICT (rename.*delete)" out &&
+               test_must_be_empty err &&
+
+               git ls-files -s >file_count &&
+               test_line_count = 2 file_count &&
+               git ls-files -u >file_count &&
+               test_line_count = 2 file_count &&
+               git ls-files -o >file_count &&
+               test_line_count = 2 file_count &&
+
+               git rev-parse >actual \
+                       :2:bar :3:bar &&
+               git rev-parse >expect \
+                       B:bar  A:bar  &&
+
+               test_cmp file_is_missing foo &&
+               # bar should have two-way merged contents of the different
+               # versions of bar; check that content from both sides is
+               # present.
+               grep original bar &&
+               grep different bar
+       )
+'
+
+# Testcase rrdd, rename/rename(2to1)/delete/delete
+#   Commit O: foo, bar
+#   Commit A: rename foo->baz, rm bar
+#   Commit B: rename bar->baz, rm foo
+#   Expected: CONFLICT (rename/rename/delete/delete), two-way merged baz
+
+test_expect_success 'rrdd-setup: rename/rename(2to1)/delete/delete conflict' '
+       test_create_repo rrdd &&
+       (
+               cd rrdd &&
+               echo foo >foo &&
+               echo bar >bar &&
+               git add foo bar &&
+               git commit -m O &&
+
+               git branch O &&
+               git branch A &&
+               git branch B &&
+
+               git checkout A &&
+               git mv foo baz &&
+               git rm bar &&
+               git commit -m "Rename foo, remove bar" &&
+
+               git checkout B &&
+               git mv bar baz &&
+               git rm foo &&
+               git commit -m "Rename bar, remove foo"
+       )
+'
+
+test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
+       (
+               cd rrdd &&
+
+               git checkout A^0 &&
+               test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+               # Not sure whether the output should contain just one
+               # "CONFLICT (rename/rename/delete/delete)" line, or if it
+               # should break it into three: "CONFLICT (rename/rename)" and
+               # two "CONFLICT (rename/delete)" lines; allow for either.
+               test_i18ngrep "CONFLICT (rename/rename)" out &&
+               test_i18ngrep "CONFLICT (rename.*delete)" out &&
+               test_must_be_empty err &&
+
+               git ls-files -s >file_count &&
+               test_line_count = 2 file_count &&
+               git ls-files -u >file_count &&
+               test_line_count = 2 file_count &&
+               git ls-files -o >file_count &&
+               test_line_count = 2 file_count &&
+
+               git rev-parse >actual \
+                       :2:baz :3:baz &&
+               git rev-parse >expect \
+                       O:foo  O:bar  &&
+
+               test_cmp file_is_missing foo &&
+               test_cmp file_is_missing bar &&
+               # baz should have two-way merged contents of the original
+               # contents of foo and bar; check that content from both sides
+               # is present.
+               grep foo baz &&
+               grep bar baz
+       )
+'
+
+# Testcase mod6, chains of rename/rename(1to2) and rename/rename(2to1)
+#   Commit O: one,      three,       five
+#   Commit A: one->two, three->four, five->six
+#   Commit B: one->six, three->two,  five->four
+#   Expected: six CONFLICT(rename/rename) messages, each path in two of the
+#             multi-way merged contents found in two, four, six
+
+test_expect_success 'mod6-setup: chains of rename/rename(1to2) and rename/rename(2to1)' '
+       test_create_repo mod6 &&
+       (
+               cd mod6 &&
+               test_seq 11 19 >one &&
+               test_seq 31 39 >three &&
+               test_seq 51 59 >five &&
+               git add . &&
+               test_tick &&
+               git commit -m "O" &&
+
+               git branch O &&
+               git branch A &&
+               git branch B &&
+
+               git checkout A &&
+               test_seq 10 19 >one &&
+               echo 40        >>three &&
+               git add one three &&
+               git mv  one   two  &&
+               git mv  three four &&
+               git mv  five  six  &&
+               test_tick &&
+               git commit -m "A" &&
+
+               git checkout B &&
+               echo 20    >>one       &&
+               echo forty >>three     &&
+               echo 60    >>five      &&
+               git add one three five &&
+               git mv  one   six  &&
+               git mv  three two  &&
+               git mv  five  four &&
+               test_tick &&
+               git commit -m "B"
+       )
+'
+
+test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename(2to1)' '
+       (
+               cd mod6 &&
+
+               git checkout A^0 &&
+
+               test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+               test_i18ngrep "CONFLICT (rename/rename)" out &&
+               test_must_be_empty err &&
+
+               git ls-files -s >file_count &&
+               test_line_count = 6 file_count &&
+               git ls-files -u >file_count &&
+               test_line_count = 6 file_count &&
+               git ls-files -o >file_count &&
+               test_line_count = 3 file_count &&
+
+               test_seq 10 20 >merged-one &&
+               test_seq 51 60 >merged-five &&
+               # Determine what the merge of three would give us.
+               test_seq 30 40 >three-side-A &&
+               test_seq 31 39 >three-side-B &&
+               echo forty >three-side-B &&
+               >empty &&
+               test_must_fail git merge-file \
+                       -L "HEAD" \
+                       -L "" \
+                       -L "B^0" \
+                       three-side-A empty three-side-B &&
+               sed -e "s/^\([<=>]\)/\1\1\1/" three-side-A >merged-three &&
+
+               # Verify the index is as expected
+               git rev-parse >actual         \
+                       :2:two       :3:two   \
+                       :2:four      :3:four  \
+                       :2:six       :3:six   &&
+               git hash-object >expect           \
+                       merged-one   merged-three \
+                       merged-three merged-five  \
+                       merged-five  merged-one   &&
+               test_cmp expect actual &&
+
+               git cat-file -p :2:two >expect &&
+               git cat-file -p :3:two >other &&
+               test_must_fail git merge-file    \
+                       -L "HEAD"  -L ""  -L "B^0" \
+                       expect     empty  other &&
+               test_cmp expect two &&
+
+               git cat-file -p :2:four >expect &&
+               git cat-file -p :3:four >other &&
+               test_must_fail git merge-file    \
+                       -L "HEAD"  -L ""  -L "B^0" \
+                       expect     empty  other &&
+               test_cmp expect four &&
+
+               git cat-file -p :2:six >expect &&
+               git cat-file -p :3:six >other &&
+               test_must_fail git merge-file    \
+                       -L "HEAD"  -L ""  -L "B^0" \
+                       expect     empty  other &&
+               test_cmp expect six
+       )
+'
+
 test_done