Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
t/t6043-merge-rename-directories.sh | 314 ++++++++++++++++++++++++++++++++++++
1 file changed, 314 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh
index bb179b16c8..7af8962512 100755
--- a/t/t6043-merge-rename-directories.sh
+++ b/t/t6043-merge-rename-directories.sh
@@ -2559,4 +2559,318 @@ test_expect_failure '9g-check: Renamed directory that only contained immediate s
# side of history for any implicit directory renames.
###########################################################################
+###########################################################################
+# SECTION 10: Handling untracked files
+#
+# unpack_trees(), upon which the recursive merge algorithm is based, aborts
+# the operation if untracked or dirty files would be deleted or overwritten
+# by the merge. Unfortunately, unpack_trees() does not understand renames,
+# and if it doesn't abort, then it muddies up the working directory before
+# we even get to the point of detecting renames, so we need some special
+# handling, at least in the case of directory renames.
+###########################################################################
+
+# Testcase 10a, Overwrite untracked: normal rename/delete
+# Commit A: z/{b,c_1}
+# Commit B: z/b + untracked z/c + untracked z/d
+# Commit C: z/{b,d_1}
+# Expected: Aborted Merge +
+# ERROR_MSG(untracked working tree files would be overwritten by merge)
+
+test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' '
+ git rm -rf . &&
+ git clean -fdqx &&
+ rm -rf .git &&
+ git init &&
+
+ mkdir z &&
+ echo b >z/b &&
+ echo c >z/c &&
+ git add z &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git branch A &&
+ git branch B &&
+ git branch C &&
+
+ git checkout B &&
+ git rm z/c &&
+ test_tick &&
+ git commit -m "B" &&
+
+ git checkout C &&
+ git mv z/c z/d &&
+ test_tick &&
+ git commit -m "C"
+'
+
+test_expect_success '10a-check: Overwrite untracked with normal rename/delete' '
+ git checkout B^0 &&
+ echo very >z/c &&
+ echo important >z/d &&
+
+ test_must_fail git merge -s recursive C^0 >out 2>err &&
+ test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
+
+ test 1 -eq $(git ls-files -s | wc -l) &&
+ test 4 -eq $(git ls-files -o | wc -l) &&
+
+ test "very" = "$(cat z/c)" &&
+ test "important" = "$(cat z/d)" &&
+ test $(git rev-parse HEAD:z/b) = $(git rev-parse A:z/b)
+'
+
+# Testcase 10b, Overwrite untracked: dir rename + delete
+# Commit A: z/{b,c_1}
+# Commit B: y/b + untracked y/{c,d,e}
+# Commit C: z/{b,d_1,e}
+# Expected: Failed Merge; y/b + untracked y/c + untracked y/d on disk +
+# z/c_1 -> z/d_1 rename recorded at stage 3 for y/d +
+# ERROR_MSG(refusing to lose untracked file at 'y/d')
+
+test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' '
+ git rm -rf . &&
+ git clean -fdqx &&
+ rm -rf .git &&
+ git init &&
+
+ mkdir z &&
+ echo b >z/b &&
+ echo c >z/c &&
+ git add z &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git branch A &&
+ git branch B &&
+ git branch C &&
+
+ git checkout B &&
+ git rm z/c &&
+ git mv z/ y/ &&
+ test_tick &&
+ git commit -m "B" &&
+
+ git checkout C &&
+ git mv z/c z/d &&
+ echo e >z/e &&
+ git add z/e &&
+ test_tick &&
+ git commit -m "C"
+'
+
+test_expect_failure '10b-check: Overwrite untracked with dir rename + delete' '
+ git checkout B^0 &&
+ echo very >y/c &&
+ echo important >y/d &&
+ echo contents >y/e &&
+
+ test_must_fail git merge -s recursive C^0 >out 2>err &&
+ test_i18ngrep "CONFLICT (rename/delete).*Version C^0 of y/d left in tree at y/d~C^0" out &&
+ test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~C^0 instead" out &&
+
+ test 3 -eq $(git ls-files -s | wc -l) &&
+ test 2 -eq $(git ls-files -u | wc -l) &&
+ test 5 -eq $(git ls-files -o | wc -l) &&
+
+ test $(git rev-parse :0:y/b) = $(git rev-parse A:z/b) &&
+ test "very" = "$(cat y/c)" &&
+
+ test "important" = "$(cat y/d)" &&
+ test "important" != "$(git rev-parse :3:y/d)" &&
+ test $(git rev-parse :3:y/d) = $(git rev-parse A:z/c) &&
+
+ test "contents" = "$(cat y/e)" &&
+ test "contents" != "$(git rev-parse :3:y/e)" &&
+ test $(git rev-parse :3:y/e) = $(git rev-parse C:z/e)
+'
+
+# Testcase 10c, Overwrite untracked: dir rename/rename(1to2)
+# Commit A: z/{a,b}, x/{c,d}
+# Commit B: y/{a,b}, w/c, x/d + different untracked y/c
+# Commit C: z/{a,b,c}, x/d
+# Expected: Failed Merge; y/{a,b} + x/d + untracked y/c +
+# CONFLICT(rename/rename) x/c -> w/c vs y/c +
+# y/c~C^0 +
+# ERROR_MSG(Refusing to lose untracked file at y/c)
+
+test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)' '
+ git rm -rf . &&
+ git clean -fdqx &&
+ rm -rf .git &&
+ git init &&
+
+ mkdir z x &&
+ echo a >z/a &&
+ echo b >z/b &&
+ echo c >x/c &&
+ echo d >x/d &&
+ git add z x &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git branch A &&
+ git branch B &&
+ git branch C &&
+
+ git checkout B &&
+ mkdir w &&
+ git mv x/c w/c &&
+ git mv z/ y/ &&
+ test_tick &&
+ git commit -m "B" &&
+
+ git checkout C &&
+ git mv x/c z/ &&
+ test_tick &&
+ git commit -m "C"
+'
+
+test_expect_failure '10c-check: Overwrite untracked with dir rename/rename(1to2)' '
+ git checkout B^0 &&
+ echo important >y/c &&
+
+ test_must_fail git merge -s recursive C^0 >out 2>err &&
+ test_i18ngrep "CONFLICT (rename/rename)" out &&
+ test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~C^0 instead" out &&
+
+ test 6 -eq $(git ls-files -s | wc -l) &&
+ test 3 -eq $(git ls-files -u | wc -l) &&
+ test 3 -eq $(git ls-files -o | wc -l) &&
+
+ test $(git rev-parse :0:y/a) = $(git rev-parse A:z/a) &&
+ test $(git rev-parse :0:y/b) = $(git rev-parse A:z/b) &&
+ test $(git rev-parse :0:x/d) = $(git rev-parse A:x/d) &&
+
+ test "important" = "$(cat y/c)" &&
+ test "important" != "$(git rev-parse :3:y/c)" &&
+ test $(git rev-parse :1:x/c) = $(git rev-parse A:x/c) &&
+ test $(git rev-parse :2:w/c) = $(git rev-parse A:x/c) &&
+ test $(git rev-parse :3:y/c) = $(git rev-parse A:x/c) &&
+ test $(git hash-object y/c~C^0) = $(git rev-parse A:x/c)
+'
+
+# Testcase 10d, Delete untracked w/ dir rename/rename(2to1)
+# Commit A: z/{a,b,c_1}, x/{d,e,f_2}
+# Commit B: y/{a,b}, x/{d,e,f_2,wham_1} + untracked y/wham
+# Commit C: z/{a,b,c_1,wham_2}, y/{d,e}
+# Expected: Failed Merge; y/{a,b,d,e} + untracked y/{wham,wham~C^0,wham~HEAD}+
+# CONFLICT(rename/rename) z/c_1 vs x/f_2 -> y/wham
+# ERROR_MSG(Refusing to lose untracked file at y/wham)
+
+test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' '
+ git rm -rf . &&
+ git clean -fdqx &&
+ rm -rf .git &&
+ git init &&
+
+ mkdir z x &&
+ echo a >z/a &&
+ echo b >z/b &&
+ echo c >z/c &&
+ echo d >x/d &&
+ echo e >x/e &&
+ echo f >x/f &&
+ git add z x &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git branch A &&
+ git branch B &&
+ git branch C &&
+
+ git checkout B &&
+ git mv z/c x/wham &&
+ git mv z/ y/ &&
+ test_tick &&
+ git commit -m "B" &&
+
+ git checkout C &&
+ git mv x/f z/wham &&
+ git mv x/ y/ &&
+ test_tick &&
+ git commit -m "C"
+'
+
+test_expect_failure '10d-check: Delete untracked with dir rename/rename(2to1)' '
+ git checkout B^0 &&
+ echo important >y/wham &&
+
+ test_must_fail git merge -s recursive C^0 >out 2>err &&
+ test_i18ngrep "CONFLICT (rename/rename)" out &&
+ test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
+
+ test 6 -eq $(git ls-files -s | wc -l) &&
+ test 2 -eq $(git ls-files -u | wc -l) &&
+ test 4 -eq $(git ls-files -o | wc -l) &&
+
+ test $(git rev-parse :0:y/a) = $(git rev-parse A:z/a) &&
+ test $(git rev-parse :0:y/b) = $(git rev-parse A:z/b) &&
+ test $(git rev-parse :0:y/d) = $(git rev-parse A:x/d) &&
+ test $(git rev-parse :0:y/e) = $(git rev-parse A:x/e) &&
+
+ test_must_fail git rev-parse :1:y/wham &&
+ test $(git rev-parse :2:y/wham) = $(git rev-parse A:z/c) &&
+ test $(git rev-parse :3:y/wham) = $(git rev-parse A:x/f) &&
+
+ test "important" = "$(cat y/wham)" &&
+ test $(git hash-object y/wham~C^0) = $(git rev-parse A:x/f) &&
+ test $(git hash-object y/wham~HEAD) = $(git rev-parse A:z/c)
+'
+
+# Testcase 10e, Does git complain about untracked file that's not in the way?
+# Commit A: z/{a,b}
+# Commit B: y/{a,b} + untracked z/c
+# Commit C: z/{a,b,c}
+# Expected: y/{a,b,c} + untracked z/c
+
+test_expect_success '10e-setup: Does git complain about untracked file that is not really in the way?' '
+ git rm -rf . &&
+ git clean -fdqx &&
+ rm -rf .git &&
+ git init &&
+
+ mkdir z &&
+ echo a >z/a &&
+ echo b >z/b &&
+ git add z &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git branch A &&
+ git branch B &&
+ git branch C &&
+
+ git checkout B &&
+ git mv z/ y/ &&
+ test_tick &&
+ git commit -m "B" &&
+
+ git checkout C &&
+ echo c >z/c &&
+ git add z/c &&
+ test_tick &&
+ git commit -m "C"
+'
+
+test_expect_failure '10e-check: Does git complain about untracked file that is not really in the way?' '
+ git checkout B^0 &&
+ mkdir z &&
+ echo random >z/c &&
+
+ git merge -s recursive C^0 >out 2>err &&
+ ! test_i18ngrep "following untracked working tree files would be overwritten by merge" err &&
+
+ test 3 -eq $(git ls-files -s | wc -l) &&
+ test 0 -eq $(git ls-files -u | wc -l) &&
+ test 3 -eq $(git ls-files -o | wc -l) &&
+
+ test $(git rev-parse :0:y/a) = $(git rev-parse A:z/a) &&
+ test $(git rev-parse :0:y/b) = $(git rev-parse A:z/b) &&
+ test $(git rev-parse :0:y/c) = $(git rev-parse C:z/c) &&
+
+ test "random" = "$(cat z/c)"
+'
+
test_done
--
2.15.0.5.g9567be9905
