directory rename detection: testcases checking which side did the rename
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
65fa3556bd
commit
4f4180624c
@ -1180,4 +1180,340 @@ test_expect_failure '5d-check: Directory/file/file conflict due to directory ren
|
|||||||
# back to old handling. But, sadly, see testcases 8a and 8b.
|
# back to old handling. But, sadly, see testcases 8a and 8b.
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# SECTION 6: Same side of the merge was the one that did the rename
|
||||||
|
#
|
||||||
|
# It may sound obvious that you only want to apply implicit directory
|
||||||
|
# renames to directories if the _other_ side of history did the renaming.
|
||||||
|
# If you did make an implementation that didn't explicitly enforce this
|
||||||
|
# rule, the majority of cases that would fall under this section would
|
||||||
|
# also be solved by following the rules from the above sections. But
|
||||||
|
# there are still a few that stick out, so this section covers them just
|
||||||
|
# to make sure we also get them right.
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
|
# Testcase 6a, Tricky rename/delete
|
||||||
|
# Commit O: z/{b,c,d}
|
||||||
|
# Commit A: z/b
|
||||||
|
# Commit B: y/{b,c}, z/d
|
||||||
|
# Expected: y/b, CONFLICT(rename/delete, z/c -> y/c vs. NULL)
|
||||||
|
# Note: We're just checking here that the rename of z/b and z/c to put
|
||||||
|
# them under y/ doesn't accidentally catch z/d and make it look like
|
||||||
|
# it is also involved in a rename/delete conflict.
|
||||||
|
|
||||||
|
test_expect_success '6a-setup: Tricky rename/delete' '
|
||||||
|
test_create_repo 6a &&
|
||||||
|
(
|
||||||
|
cd 6a &&
|
||||||
|
|
||||||
|
mkdir z &&
|
||||||
|
echo b >z/b &&
|
||||||
|
echo c >z/c &&
|
||||||
|
echo d >z/d &&
|
||||||
|
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 rm z/d &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m "A" &&
|
||||||
|
|
||||||
|
git checkout B &&
|
||||||
|
mkdir y &&
|
||||||
|
git mv z/b y/ &&
|
||||||
|
git mv z/c y/ &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m "B"
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '6a-check: Tricky rename/delete' '
|
||||||
|
(
|
||||||
|
cd 6a &&
|
||||||
|
|
||||||
|
git checkout A^0 &&
|
||||||
|
|
||||||
|
test_must_fail git merge -s recursive B^0 >out &&
|
||||||
|
test_i18ngrep "CONFLICT (rename/delete).*z/c.*y/c" out &&
|
||||||
|
|
||||||
|
git ls-files -s >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:y/b :3:y/c &&
|
||||||
|
git rev-parse >expect \
|
||||||
|
O:z/b O:z/c &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
# Testcase 6b, Same rename done on both sides
|
||||||
|
# (Related to testcases 6c and 8e)
|
||||||
|
# Commit O: z/{b,c}
|
||||||
|
# Commit A: y/{b,c}
|
||||||
|
# Commit B: y/{b,c}, z/d
|
||||||
|
# Expected: y/{b,c}, z/d
|
||||||
|
# Note: If we did directory rename detection here, we'd move z/d into y/,
|
||||||
|
# but B did that rename and still decided to put the file into z/,
|
||||||
|
# so we probably shouldn't apply directory rename detection for it.
|
||||||
|
|
||||||
|
test_expect_success '6b-setup: Same rename done on both sides' '
|
||||||
|
test_create_repo 6b &&
|
||||||
|
(
|
||||||
|
cd 6b &&
|
||||||
|
|
||||||
|
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 mv z y &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m "A" &&
|
||||||
|
|
||||||
|
git checkout B &&
|
||||||
|
git mv z y &&
|
||||||
|
mkdir z &&
|
||||||
|
echo d >z/d &&
|
||||||
|
git add z/d &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m "B"
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '6b-check: Same rename done on both sides' '
|
||||||
|
(
|
||||||
|
cd 6b &&
|
||||||
|
|
||||||
|
git checkout A^0 &&
|
||||||
|
|
||||||
|
git merge -s recursive B^0 &&
|
||||||
|
|
||||||
|
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 = 1 out &&
|
||||||
|
|
||||||
|
git rev-parse >actual \
|
||||||
|
HEAD:y/b HEAD:y/c HEAD:z/d &&
|
||||||
|
git rev-parse >expect \
|
||||||
|
O:z/b O:z/c B:z/d &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
# Testcase 6c, Rename only done on same side
|
||||||
|
# (Related to testcases 6b and 8e)
|
||||||
|
# Commit O: z/{b,c}
|
||||||
|
# Commit A: z/{b,c} (no change)
|
||||||
|
# Commit B: y/{b,c}, z/d
|
||||||
|
# Expected: y/{b,c}, z/d
|
||||||
|
# NOTE: Seems obvious, but just checking that the implementation doesn't
|
||||||
|
# "accidentally detect a rename" and give us y/{b,c,d}.
|
||||||
|
|
||||||
|
test_expect_success '6c-setup: Rename only done on same side' '
|
||||||
|
test_create_repo 6c &&
|
||||||
|
(
|
||||||
|
cd 6c &&
|
||||||
|
|
||||||
|
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 &&
|
||||||
|
test_tick &&
|
||||||
|
git commit --allow-empty -m "A" &&
|
||||||
|
|
||||||
|
git checkout B &&
|
||||||
|
git mv z y &&
|
||||||
|
mkdir z &&
|
||||||
|
echo d >z/d &&
|
||||||
|
git add z/d &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m "B"
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '6c-check: Rename only done on same side' '
|
||||||
|
(
|
||||||
|
cd 6c &&
|
||||||
|
|
||||||
|
git checkout A^0 &&
|
||||||
|
|
||||||
|
git merge -s recursive B^0 &&
|
||||||
|
|
||||||
|
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 = 1 out &&
|
||||||
|
|
||||||
|
git rev-parse >actual \
|
||||||
|
HEAD:y/b HEAD:y/c HEAD:z/d &&
|
||||||
|
git rev-parse >expect \
|
||||||
|
O:z/b O:z/c B:z/d &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
# Testcase 6d, We don't always want transitive renaming
|
||||||
|
# (Related to testcase 1c)
|
||||||
|
# Commit O: z/{b,c}, x/d
|
||||||
|
# Commit A: z/{b,c}, x/d (no change)
|
||||||
|
# Commit B: y/{b,c}, z/d
|
||||||
|
# Expected: y/{b,c}, z/d
|
||||||
|
# NOTE: Again, this seems obvious but just checking that the implementation
|
||||||
|
# doesn't "accidentally detect a rename" and give us y/{b,c,d}.
|
||||||
|
|
||||||
|
test_expect_success '6d-setup: We do not always want transitive renaming' '
|
||||||
|
test_create_repo 6d &&
|
||||||
|
(
|
||||||
|
cd 6d &&
|
||||||
|
|
||||||
|
mkdir z &&
|
||||||
|
echo b >z/b &&
|
||||||
|
echo c >z/c &&
|
||||||
|
mkdir x &&
|
||||||
|
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 &&
|
||||||
|
test_tick &&
|
||||||
|
git commit --allow-empty -m "A" &&
|
||||||
|
|
||||||
|
git checkout B &&
|
||||||
|
git mv z y &&
|
||||||
|
git mv x z &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m "B"
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '6d-check: We do not always want transitive renaming' '
|
||||||
|
(
|
||||||
|
cd 6d &&
|
||||||
|
|
||||||
|
git checkout A^0 &&
|
||||||
|
|
||||||
|
git merge -s recursive B^0 &&
|
||||||
|
|
||||||
|
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 = 1 out &&
|
||||||
|
|
||||||
|
git rev-parse >actual \
|
||||||
|
HEAD:y/b HEAD:y/c HEAD:z/d &&
|
||||||
|
git rev-parse >expect \
|
||||||
|
O:z/b O:z/c O:x/d &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
# Testcase 6e, Add/add from one-side
|
||||||
|
# Commit O: z/{b,c}
|
||||||
|
# Commit A: z/{b,c} (no change)
|
||||||
|
# Commit B: y/{b,c,d_1}, z/d_2
|
||||||
|
# Expected: y/{b,c,d_1}, z/d_2
|
||||||
|
# NOTE: Again, this seems obvious but just checking that the implementation
|
||||||
|
# doesn't "accidentally detect a rename" and give us y/{b,c} +
|
||||||
|
# add/add conflict on y/d_1 vs y/d_2.
|
||||||
|
|
||||||
|
test_expect_success '6e-setup: Add/add from one side' '
|
||||||
|
test_create_repo 6e &&
|
||||||
|
(
|
||||||
|
cd 6e &&
|
||||||
|
|
||||||
|
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 &&
|
||||||
|
test_tick &&
|
||||||
|
git commit --allow-empty -m "A" &&
|
||||||
|
|
||||||
|
git checkout B &&
|
||||||
|
git mv z y &&
|
||||||
|
echo d1 > y/d &&
|
||||||
|
mkdir z &&
|
||||||
|
echo d2 > z/d &&
|
||||||
|
git add y/d z/d &&
|
||||||
|
test_tick &&
|
||||||
|
git commit -m "B"
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success '6e-check: Add/add from one side' '
|
||||||
|
(
|
||||||
|
cd 6e &&
|
||||||
|
|
||||||
|
git checkout A^0 &&
|
||||||
|
|
||||||
|
git merge -s recursive B^0 &&
|
||||||
|
|
||||||
|
git ls-files -s >out &&
|
||||||
|
test_line_count = 4 out &&
|
||||||
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 0 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
|
git rev-parse >actual \
|
||||||
|
HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/d &&
|
||||||
|
git rev-parse >expect \
|
||||||
|
O:z/b O:z/c B:y/d B:z/d &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
|
###########################################################################
|
||||||
|
# Rules suggested by section 6:
|
||||||
|
#
|
||||||
|
# Only apply implicit directory renames to directories if the other
|
||||||
|
# side of history is the one doing the renaming.
|
||||||
|
###########################################################################
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user