undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6036: add a failed conflict detection case with symlink modify/modify

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-06-30 21:11:17 -07:00 committed by Junio C Hamano
parent e3331758f1
commit c6d3dd5daf
1 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
t/t6036-recursive-corner-cases.sh
View File

@ -805,4 +805,71 @@ test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' '
) )
' '
#
# criss-cross with modify/modify on a symlink:
#
# B D
# o---o
# / \ / \
# A o X ? F
# \ / \ /
# o---o
# C E
#
# Commit A: simple simlink fickle->lagoon
# Commit B: redirect fickle->disneyland
# Commit C: redirect fickle->home
# Commit D: merge B&C, resolving in favor of B
# Commit E: merge B&C, resolving in favor of C
#
# This is an obvious modify/modify conflict for the symlink 'fickle'. Can
# git detect it?
test_expect_success 'setup symlink modify/modify' '
test_create_repo symlink-modify-modify &&
(
cd symlink-modify-modify &&
test_ln_s_add lagoon fickle &&
git commit -m A &&
git tag A &&
git checkout -b B A &&
git rm fickle &&
test_ln_s_add disneyland fickle &&
git commit -m B &&
git checkout -b C A &&
git rm fickle &&
test_ln_s_add home fickle &&
git add fickle &&
git commit -m C &&
git checkout -q B^0 &&
git merge -s ours -m D C^0 &&
git tag D &&
git checkout -q C^0 &&
git merge -s ours -m E B^0 &&
git tag E
)
'
test_expect_failure 'check symlink modify/modify' '
(
cd symlink-modify-modify &&
git checkout D^0 &&
test_must_fail git merge -s recursive E^0 &&
git ls-files -s >out &&
test_line_count = 3 out &&
git ls-files -u >out &&
test_line_count = 3 out &&
git ls-files -o >out &&
test_line_count = 1 out
)
'
test_done test_done