directory rename detection: tests for handling overwriting untracked files
Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
Junio C Hamano
parent
792e1371d9
commit
a0b0a15103
@ -2879,4 +2879,371 @@ 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 O: z/{b,c_1}
|
||||
# Commit A: z/b + untracked z/c + untracked z/d
|
||||
# Commit B: 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' '
|
||||
test_create_repo 10a &&
|
||||
(
|
||||
cd 10a &&
|
||||
|
||||
mkdir z &&
|
||||
echo b >z/b &&
|
||||
echo c >z/c &&
|
||||
git add z &&
|
||||
test_tick &&
|
||||
git commit -m "O" &&
|
||||
|
||||
git branch O &&
|
||||
git branch A &&
|
||||
git branch B &&
|
||||
|
||||
git checkout A &&
|
||||
git rm z/c &&
|
||||
test_tick &&
|
||||
git commit -m "A" &&
|
||||
|
||||
git checkout B &&
|
||||
git mv z/c z/d &&
|
||||
test_tick &&
|
||||
git commit -m "B"
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success '10a-check: Overwrite untracked with normal rename/delete' '
|
||||
(
|
||||
cd 10a &&
|
||||
|
||||
git checkout A^0 &&
|
||||
echo very >z/c &&
|
||||
echo important >z/d &&
|
||||
|
||||
test_must_fail git merge -s recursive B^0 >out 2>err &&
|
||||
test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
|
||||
|
||||
git ls-files -s >out &&
|
||||
test_line_count = 1 out &&
|
||||
git ls-files -o >out &&
|
||||
test_line_count = 4 out &&
|
||||
|
||||
echo very >expect &&
|
||||
test_cmp expect z/c &&
|
||||
|
||||
echo important >expect &&
|
||||
test_cmp expect z/d &&
|
||||
|
||||
git rev-parse HEAD:z/b >actual &&
|
||||
git rev-parse O:z/b >expect &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
'
|
||||
|
||||
# Testcase 10b, Overwrite untracked: dir rename + delete
|
||||
# Commit O: z/{b,c_1}
|
||||
# Commit A: y/b + untracked y/{c,d,e}
|
||||
# Commit B: 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' '
|
||||
test_create_repo 10b &&
|
||||
(
|
||||
cd 10b &&
|
||||
|
||||
mkdir z &&
|
||||
echo b >z/b &&
|
||||
echo c >z/c &&
|
||||
git add z &&
|
||||
test_tick &&
|
||||
git commit -m "O" &&
|
||||
|
||||
git branch O &&
|
||||
git branch A &&
|
||||
git branch B &&
|
||||
|
||||
git checkout A &&
|
||||
git rm z/c &&
|
||||
git mv z/ y/ &&
|
||||
test_tick &&
|
||||
git commit -m "A" &&
|
||||
|
||||
git checkout B &&
|
||||
git mv z/c z/d &&
|
||||
echo e >z/e &&
|
||||
git add z/e &&
|
||||
test_tick &&
|
||||
git commit -m "B"
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure '10b-check: Overwrite untracked with dir rename + delete' '
|
||||
(
|
||||
cd 10b &&
|
||||
|
||||
git checkout A^0 &&
|
||||
echo very >y/c &&
|
||||
echo important >y/d &&
|
||||
echo contents >y/e &&
|
||||
|
||||
test_must_fail git merge -s recursive B^0 >out 2>err &&
|
||||
test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
|
||||
test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
|
||||
|
||||
git ls-files -s >out &&
|
||||
test_line_count = 3 out &&
|
||||
git ls-files -u >out &&
|
||||
test_line_count = 2 out &&
|
||||
git ls-files -o >out &&
|
||||
test_line_count = 5 out &&
|
||||
|
||||
git rev-parse >actual \
|
||||
:0:y/b :3:y/d :3:y/e &&
|
||||
git rev-parse >expect \
|
||||
O:z/b O:z/c B:z/e &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
echo very >expect &&
|
||||
test_cmp expect y/c &&
|
||||
|
||||
echo important >expect &&
|
||||
test_cmp expect y/d &&
|
||||
|
||||
echo contents >expect &&
|
||||
test_cmp expect y/e
|
||||
)
|
||||
'
|
||||
|
||||
# Testcase 10c, Overwrite untracked: dir rename/rename(1to2)
|
||||
# Commit O: z/{a,b}, x/{c,d}
|
||||
# Commit A: y/{a,b}, w/c, x/d + different untracked y/c
|
||||
# Commit B: 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~B^0 +
|
||||
# ERROR_MSG(Refusing to lose untracked file at y/c)
|
||||
|
||||
test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)' '
|
||||
test_create_repo 10c &&
|
||||
(
|
||||
cd 10c &&
|
||||
|
||||
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 "O" &&
|
||||
|
||||
git branch O &&
|
||||
git branch A &&
|
||||
git branch B &&
|
||||
|
||||
git checkout A &&
|
||||
mkdir w &&
|
||||
git mv x/c w/c &&
|
||||
git mv z/ y/ &&
|
||||
test_tick &&
|
||||
git commit -m "A" &&
|
||||
|
||||
git checkout B &&
|
||||
git mv x/c z/ &&
|
||||
test_tick &&
|
||||
git commit -m "B"
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure '10c-check: Overwrite untracked with dir rename/rename(1to2)' '
|
||||
(
|
||||
cd 10c &&
|
||||
|
||||
git checkout A^0 &&
|
||||
echo important >y/c &&
|
||||
|
||||
test_must_fail git merge -s recursive B^0 >out 2>err &&
|
||||
test_i18ngrep "CONFLICT (rename/rename)" out &&
|
||||
test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
|
||||
|
||||
git ls-files -s >out &&
|
||||
test_line_count = 6 out &&
|
||||
git ls-files -u >out &&
|
||||
test_line_count = 3 out &&
|
||||
git ls-files -o >out &&
|
||||
test_line_count = 3 out &&
|
||||
|
||||
git rev-parse >actual \
|
||||
:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
|
||||
git rev-parse >expect \
|
||||
O:z/a O:z/b O:x/d O:x/c O:x/c O:x/c &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
git hash-object y/c~B^0 >actual &&
|
||||
git rev-parse O:x/c >expect &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
echo important >expect &&
|
||||
test_cmp expect y/c
|
||||
)
|
||||
'
|
||||
|
||||
# Testcase 10d, Delete untracked w/ dir rename/rename(2to1)
|
||||
# Commit O: z/{a,b,c_1}, x/{d,e,f_2}
|
||||
# Commit A: y/{a,b}, x/{d,e,f_2,wham_1} + untracked y/wham
|
||||
# Commit B: z/{a,b,c_1,wham_2}, y/{d,e}
|
||||
# Expected: Failed Merge; y/{a,b,d,e} + untracked y/{wham,wham~B^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)' '
|
||||
test_create_repo 10d &&
|
||||
(
|
||||
cd 10d &&
|
||||
|
||||
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 "O" &&
|
||||
|
||||
git branch O &&
|
||||
git branch A &&
|
||||
git branch B &&
|
||||
|
||||
git checkout A &&
|
||||
git mv z/c x/wham &&
|
||||
git mv z/ y/ &&
|
||||
test_tick &&
|
||||
git commit -m "A" &&
|
||||
|
||||
git checkout B &&
|
||||
git mv x/f z/wham &&
|
||||
git mv x/ y/ &&
|
||||
test_tick &&
|
||||
git commit -m "B"
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure '10d-check: Delete untracked with dir rename/rename(2to1)' '
|
||||
(
|
||||
cd 10d &&
|
||||
|
||||
git checkout A^0 &&
|
||||
echo important >y/wham &&
|
||||
|
||||
test_must_fail git merge -s recursive B^0 >out 2>err &&
|
||||
test_i18ngrep "CONFLICT (rename/rename)" out &&
|
||||
test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
|
||||
|
||||
git ls-files -s >out &&
|
||||
test_line_count = 6 out &&
|
||||
git ls-files -u >out &&
|
||||
test_line_count = 2 out &&
|
||||
git ls-files -o >out &&
|
||||
test_line_count = 4 out &&
|
||||
|
||||
git rev-parse >actual \
|
||||
:0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
|
||||
git rev-parse >expect \
|
||||
O:z/a O:z/b O:x/d O:x/e O:z/c O:x/f &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
test_must_fail git rev-parse :1:y/wham &&
|
||||
|
||||
echo important >expect &&
|
||||
test_cmp expect y/wham &&
|
||||
|
||||
git hash-object >actual \
|
||||
y/wham~B^0 y/wham~HEAD &&
|
||||
git rev-parse >expect \
|
||||
O:x/f O:z/c &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
'
|
||||
|
||||
# Testcase 10e, Does git complain about untracked file that's not in the way?
|
||||
# Commit O: z/{a,b}
|
||||
# Commit A: y/{a,b} + untracked z/c
|
||||
# Commit B: 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?' '
|
||||
test_create_repo 10e &&
|
||||
(
|
||||
cd 10e &&
|
||||
|
||||
mkdir z &&
|
||||
echo a >z/a &&
|
||||
echo b >z/b &&
|
||||
git add z &&
|
||||
test_tick &&
|
||||
git commit -m "O" &&
|
||||
|
||||
git branch O &&
|
||||
git branch A &&
|
||||
git branch B &&
|
||||
|
||||
git checkout A &&
|
||||
git mv z/ y/ &&
|
||||
test_tick &&
|
||||
git commit -m "A" &&
|
||||
|
||||
git checkout B &&
|
||||
echo c >z/c &&
|
||||
git add z/c &&
|
||||
test_tick &&
|
||||
git commit -m "B"
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure '10e-check: Does git complain about untracked file that is not really in the way?' '
|
||||
(
|
||||
cd 10e &&
|
||||
|
||||
git checkout A^0 &&
|
||||
mkdir z &&
|
||||
echo random >z/c &&
|
||||
|
||||
git merge -s recursive B^0 >out 2>err &&
|
||||
test_i18ngrep ! "following untracked working tree files would be overwritten by merge" err &&
|
||||
|
||||
git ls-files -s >out &&
|
||||
test_line_count = 3 out &&
|
||||
git ls-files -u >out &&
|
||||
test_line_count = 0 out &&
|
||||
git ls-files -o >out &&
|
||||
test_line_count = 3 out &&
|
||||
|
||||
git rev-parse >actual \
|
||||
:0:y/a :0:y/b :0:y/c &&
|
||||
git rev-parse >expect \
|
||||
O:z/a O:z/b B:z/c &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
echo random >expect &&
|
||||
test_cmp expect z/c
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user