kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t6036, t6042: use test_create_repo to keep tests independent 

These tests used pretty strong measures to get a clean slate:
        git rm -rf . &&
        git clean -fdqx &&
        rm -rf .git &&
        git init &&
It's easier, safer (what if a previous test has a bug and accidentally
changes into a directory outside the test path?), and allows re-inspecting
test setup later if we instead just use test_create_repo to put different
tests into separate sub-repositories.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2018-05-24 00:04:35 -07:00 committed by Junio C Hamano
parent e144d126d7
commit 2a4c19efbf
2 changed files with 837 additions and 726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,51 +21,60 @@ get_clean_checkout () {
# #


test_expect_success 'setup basic criss-cross + rename with no modifications' ' test_expect_success 'setup basic criss-cross + rename with no modifications' '
ten="0 1 2 3 4 5 6 7 8 9" && test_create_repo basic-rename &&
for i in $ten (
do cd basic-rename &&
echo line $i in a sample file
done >one &&
for i in $ten
do
echo line $i in another sample file
done >two &&
git add one two &&
test_tick && git commit -m initial &&


git branch L1 && ten="0 1 2 3 4 5 6 7 8 9" &&
git checkout -b R1 && for i in $ten
git mv one three && do
test_tick && git commit -m R1 && echo line $i in a sample file
done >one &&
for i in $ten
do
echo line $i in another sample file
done >two &&
git add one two &&
test_tick && git commit -m initial &&


git checkout L1 && git branch L1 &&
git mv two three && git checkout -b R1 &&
test_tick && git commit -m L1 && git mv one three &&
test_tick && git commit -m R1 &&


git checkout L1^0 && git checkout L1 &&
test_tick && git merge -s ours R1 && git mv two three &&
git tag L2 && test_tick && git commit -m L1 &&


git checkout R1^0 && git checkout L1^0 &&
test_tick && git merge -s ours L1 && test_tick && git merge -s ours R1 &&
git tag R2 git tag L2 &&

git checkout R1^0 &&
test_tick && git merge -s ours L1 &&
git tag R2
)
' '


test_expect_success 'merge simple rename+criss-cross with no modifications' ' test_expect_success 'merge simple rename+criss-cross with no modifications' '
git reset --hard && (
git checkout L2^0 && cd basic-rename &&


test_must_fail git merge -s recursive R2^0 && git reset --hard &&
git checkout L2^0 &&


test 2 = $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive R2^0 &&
test 2 = $(git ls-files -u | wc -l) &&
test 2 = $(git ls-files -o | wc -l) &&


test $(git rev-parse :2:three) = $(git rev-parse L2:three) && test 2 = $(git ls-files -s | wc -l) &&
test $(git rev-parse :3:three) = $(git rev-parse R2:three) && test 2 = $(git ls-files -u | wc -l) &&
test 2 = $(git ls-files -o | wc -l) &&


test $(git rev-parse L2:three) = $(git hash-object three~HEAD) && test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
test $(git rev-parse R2:three) = $(git hash-object three~R2^0) test $(git rev-parse :3:three) = $(git rev-parse R2:three) &&

test $(git rev-parse L2:three) = $(git hash-object three~HEAD) &&
test $(git rev-parse R2:three) = $(git hash-object three~R2^0)
)
' '


# #
@ -81,58 +90,61 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
# #


test_expect_success 'setup criss-cross + rename merges with basic modification' ' test_expect_success 'setup criss-cross + rename merges with basic modification' '
git rm -rf . && test_create_repo rename-modify &&
git clean -fdqx && (
rm -rf .git && cd rename-modify &&
git init &&


ten="0 1 2 3 4 5 6 7 8 9" && ten="0 1 2 3 4 5 6 7 8 9" &&
for i in $ten for i in $ten
do do
echo line $i in a sample file echo line $i in a sample file
done >one && done >one &&
for i in $ten for i in $ten
do do
echo line $i in another sample file echo line $i in another sample file
done >two && done >two &&
git add one two && git add one two &&
test_tick && git commit -m initial && test_tick && git commit -m initial &&


git branch L1 && git branch L1 &&
git checkout -b R1 && git checkout -b R1 &&
git mv one three && git mv one three &&
echo more >>two && echo more >>two &&
git add two && git add two &&
test_tick && git commit -m R1 && test_tick && git commit -m R1 &&


git checkout L1 && git checkout L1 &&
git mv two three && git mv two three &&
test_tick && git commit -m L1 && test_tick && git commit -m L1 &&


git checkout L1^0 && git checkout L1^0 &&
test_tick && git merge -s ours R1 && test_tick && git merge -s ours R1 &&
git tag L2 && git tag L2 &&


git checkout R1^0 && git checkout R1^0 &&
test_tick && git merge -s ours L1 && test_tick && git merge -s ours L1 &&
git tag R2 git tag R2
)
' '


test_expect_success 'merge criss-cross + rename merges with basic modification' ' test_expect_success 'merge criss-cross + rename merges with basic modification' '
git reset --hard && (
git checkout L2^0 && cd rename-modify &&


test_must_fail git merge -s recursive R2^0 && git checkout L2^0 &&


test 2 = $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive R2^0 &&
test 2 = $(git ls-files -u | wc -l) &&
test 2 = $(git ls-files -o | wc -l) &&


test $(git rev-parse :2:three) = $(git rev-parse L2:three) && test 2 = $(git ls-files -s | wc -l) &&
test $(git rev-parse :3:three) = $(git rev-parse R2:three) && test 2 = $(git ls-files -u | wc -l) &&
test 2 = $(git ls-files -o | wc -l) &&


test $(git rev-parse L2:three) = $(git hash-object three~HEAD) && test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
test $(git rev-parse R2:three) = $(git hash-object three~R2^0) test $(git rev-parse :3:three) = $(git rev-parse R2:three) &&

test $(git rev-parse L2:three) = $(git hash-object three~HEAD) &&
test $(git rev-parse R2:three) = $(git hash-object three~R2^0)
)
' '


# #
@ -156,64 +168,67 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'
# #


test_expect_success 'setup differently handled merges of rename/add conflict' ' test_expect_success 'setup differently handled merges of rename/add conflict' '
git rm -rf . && test_create_repo rename-add &&
git clean -fdqx && (
rm -rf .git && cd rename-add &&
git init &&


printf "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n" >a && printf "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n" >a &&
git add a && git add a &&
test_tick && git commit -m A && test_tick && git commit -m A &&


git branch B && git branch B &&
git checkout -b C && git checkout -b C &&
echo 10 >>a && echo 10 >>a &&
echo "other content" >>new_a && echo "other content" >>new_a &&
git add a new_a && git add a new_a &&
test_tick && git commit -m C && test_tick && git commit -m C &&


git checkout B && git checkout B &&
git mv a new_a && git mv a new_a &&
test_tick && git commit -m B && test_tick && git commit -m B &&


git checkout B^0 && git checkout B^0 &&
test_must_fail git merge C && test_must_fail git merge C &&
git clean -f && git clean -f &&
test_tick && git commit -m D && test_tick && git commit -m D &&
git tag D && git tag D &&


git checkout C^0 && git checkout C^0 &&
test_must_fail git merge B && test_must_fail git merge B &&
rm new_a~HEAD new_a && rm new_a~HEAD new_a &&
printf "Incorrectly merged content" >>new_a && printf "Incorrectly merged content" >>new_a &&
git add -u && git add -u &&
test_tick && git commit -m E && test_tick && git commit -m E &&
git tag E git tag E
)
' '


test_expect_success 'git detects differently handled merges conflict' ' test_expect_success 'git detects differently handled merges conflict' '
git reset --hard && (
git checkout D^0 && cd rename-add &&


test_must_fail git merge -s recursive E^0 && git checkout D^0 &&


test 3 = $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive E^0 &&
test 3 = $(git ls-files -u | wc -l) &&
test 0 = $(git ls-files -o | wc -l) &&


test $(git rev-parse :2:new_a) = $(git rev-parse D:new_a) && test 3 = $(git ls-files -s | wc -l) &&
test $(git rev-parse :3:new_a) = $(git rev-parse E:new_a) && test 3 = $(git ls-files -u | wc -l) &&
test 0 = $(git ls-files -o | wc -l) &&


git cat-file -p B:new_a >>merged && test $(git rev-parse :2:new_a) = $(git rev-parse D:new_a) &&
git cat-file -p C:new_a >>merge-me && test $(git rev-parse :3:new_a) = $(git rev-parse E:new_a) &&
>empty &&
test_must_fail git merge-file \ git cat-file -p B:new_a >>merged &&
-L "Temporary merge branch 2" \ git cat-file -p C:new_a >>merge-me &&
-L "" \ >empty &&
-L "Temporary merge branch 1" \ test_must_fail git merge-file \
merged empty merge-me && -L "Temporary merge branch 2" \
sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal && -L "" \
test $(git rev-parse :1:new_a) = $(git hash-object merged-internal) -L "Temporary merge branch 1" \
merged empty merge-me &&
sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal &&
test $(git rev-parse :1:new_a) = $(git hash-object merged-internal)
)
' '


# #
@ -236,67 +251,75 @@ test_expect_success 'git detects differently handled merges conflict' '
# Merging commits D & E should result in modify/delete conflict. # Merging commits D & E should result in modify/delete conflict.


test_expect_success 'setup criss-cross + modify/delete resolved differently' ' test_expect_success 'setup criss-cross + modify/delete resolved differently' '
git rm -rf . && test_create_repo modify-delete &&
git clean -fdqx && (
rm -rf .git && cd modify-delete &&
git init &&


echo A >file && echo A >file &&
git add file && git add file &&
test_tick && test_tick &&
git commit -m A && git commit -m A &&


git branch B && git branch B &&
git checkout -b C && git checkout -b C &&
git rm file && git rm file &&
test_tick && test_tick &&
git commit -m C && git commit -m C &&


git checkout B && git checkout B &&
echo B >file && echo B >file &&
git add file && git add file &&
test_tick && test_tick &&
git commit -m B && git commit -m B &&


git checkout B^0 && git checkout B^0 &&
test_must_fail git merge C && test_must_fail git merge C &&
echo B >file && echo B >file &&
git add file && git add file &&
test_tick && test_tick &&
git commit -m D && git commit -m D &&
git tag D && git tag D &&


git checkout C^0 && git checkout C^0 &&
test_must_fail git merge B && test_must_fail git merge B &&
git rm file && git rm file &&
test_tick && test_tick &&
git commit -m E && git commit -m E &&
git tag E git tag E
)
' '


test_expect_success 'git detects conflict merging criss-cross+modify/delete' ' test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
git checkout D^0 && (
cd modify-delete &&


test_must_fail git merge -s recursive E^0 && git checkout D^0 &&


test 2 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive E^0 &&
test 2 -eq $(git ls-files -u | wc -l) &&


test $(git rev-parse :1:file) = $(git rev-parse master:file) && test 2 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse :2:file) = $(git rev-parse B:file) test 2 -eq $(git ls-files -u | wc -l) &&

test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
test $(git rev-parse :2:file) = $(git rev-parse B:file)
)
' '


test_expect_success 'git detects conflict merging criss-cross+modify/delete, reverse direction' ' test_expect_success 'git detects conflict merging criss-cross+modify/delete, reverse direction' '
git reset --hard && (
git checkout E^0 && cd modify-delete &&


test_must_fail git merge -s recursive D^0 && git reset --hard &&
git checkout E^0 &&


test 2 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive D^0 &&
test 2 -eq $(git ls-files -u | wc -l) &&


test $(git rev-parse :1:file) = $(git rev-parse master:file) && test 2 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse :3:file) = $(git rev-parse B:file) test 2 -eq $(git ls-files -u | wc -l) &&

test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
test $(git rev-parse :3:file) = $(git rev-parse B:file)
)
' '


# #
@ -336,120 +359,136 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
# #


test_expect_success 'setup differently handled merges of directory/file conflict' ' test_expect_success 'setup differently handled merges of directory/file conflict' '
git rm -rf . && test_create_repo directory-file &&
git clean -fdqx && (
rm -rf .git && cd directory-file &&
git init &&


>ignore-me && >ignore-me &&
git add ignore-me && git add ignore-me &&
test_tick && test_tick &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git branch B && git branch B &&
git checkout -b C && git checkout -b C &&
mkdir a && mkdir a &&
echo 10 >a/file && echo 10 >a/file &&
git add a/file && git add a/file &&
test_tick && test_tick &&
git commit -m C && git commit -m C &&


git checkout B && git checkout B &&
echo 5 >a && echo 5 >a &&
git add a && git add a &&
test_tick && test_tick &&
git commit -m B && git commit -m B &&


git checkout B^0 && git checkout B^0 &&
test_must_fail git merge C && test_must_fail git merge C &&
git clean -f && git clean -f &&
rm -rf a/ && rm -rf a/ &&
echo 5 >a && echo 5 >a &&
git add a && git add a &&
test_tick && test_tick &&
git commit -m D && git commit -m D &&
git tag D && git tag D &&


git checkout C^0 && git checkout C^0 &&
test_must_fail git merge B && test_must_fail git merge B &&
git clean -f && git clean -f &&
git rm --cached a && git rm --cached a &&
echo 10 >a/file && echo 10 >a/file &&
git add a/file && git add a/file &&
test_tick && test_tick &&
git commit -m E1 && git commit -m E1 &&
git tag E1 && git tag E1 &&


git checkout C^0 && git checkout C^0 &&
test_must_fail git merge B && test_must_fail git merge B &&
git clean -f && git clean -f &&
git rm --cached a && git rm --cached a &&
printf "10\n11\n" >a/file && printf "10\n11\n" >a/file &&
git add a/file && git add a/file &&
test_tick && test_tick &&
git commit -m E2 && git commit -m E2 &&
git tag E2 git tag E2
)
' '


test_expect_success 'merge of D & E1 fails but has appropriate contents' ' test_expect_success 'merge of D & E1 fails but has appropriate contents' '
get_clean_checkout D^0 && (
cd directory-file &&


test_must_fail git merge -s recursive E1^0 && get_clean_checkout D^0 &&


test 2 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive E1^0 &&
test 1 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) && test 2 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse :2:a) = $(git rev-parse B:a) test 1 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&

test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
test $(git rev-parse :2:a) = $(git rev-parse B:a)
)
' '


test_expect_success 'merge of E1 & D fails but has appropriate contents' ' test_expect_success 'merge of E1 & D fails but has appropriate contents' '
get_clean_checkout E1^0 && (
cd directory-file &&


test_must_fail git merge -s recursive D^0 && get_clean_checkout E1^0 &&


test 2 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive D^0 &&
test 1 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) && test 2 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse :3:a) = $(git rev-parse B:a) test 1 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&

test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
test $(git rev-parse :3:a) = $(git rev-parse B:a)
)
' '


test_expect_success 'merge of D & E2 fails but has appropriate contents' ' test_expect_success 'merge of D & E2 fails but has appropriate contents' '
get_clean_checkout D^0 && (
cd directory-file &&


test_must_fail git merge -s recursive E2^0 && get_clean_checkout D^0 &&


test 4 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive E2^0 &&
test 3 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse :2:a) = $(git rev-parse B:a) && test 4 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse :3:a/file) = $(git rev-parse E2:a/file) && test 3 -eq $(git ls-files -u | wc -l) &&
test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) && test 1 -eq $(git ls-files -o | wc -l) &&
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&


test -f a~HEAD test $(git rev-parse :2:a) = $(git rev-parse B:a) &&
test $(git rev-parse :3:a/file) = $(git rev-parse E2:a/file) &&
test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) &&
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&

test -f a~HEAD
)
' '


test_expect_success 'merge of E2 & D fails but has appropriate contents' ' test_expect_success 'merge of E2 & D fails but has appropriate contents' '
get_clean_checkout E2^0 && (
cd directory-file &&


test_must_fail git merge -s recursive D^0 && get_clean_checkout E2^0 &&


test 4 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive D^0 &&
test 3 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse :3:a) = $(git rev-parse B:a) && test 4 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse :2:a/file) = $(git rev-parse E2:a/file) && test 3 -eq $(git ls-files -u | wc -l) &&
test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) && test 1 -eq $(git ls-files -o | wc -l) &&
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&


test -f a~D^0 test $(git rev-parse :3:a) = $(git rev-parse B:a) &&
test $(git rev-parse :2:a/file) = $(git rev-parse E2:a/file) &&
test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) &&
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&

test -f a~D^0
)
' '


# #
@ -492,52 +531,55 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' '
# but that may cancel out at the final merge stage". # but that may cancel out at the final merge stage".


test_expect_success 'setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify' ' test_expect_success 'setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify' '
git reset --hard && test_create_repo rename-squared-squared &&
git rm -rf . && (
git clean -fdqx && cd rename-squared-squared &&
rm -rf .git &&
git init &&


printf "1\n2\n3\n4\n5\n6\n" >a && printf "1\n2\n3\n4\n5\n6\n" >a &&
git add a && git add a &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a b && git mv a b &&
echo 7 >>b && echo 7 >>b &&
git add -u && git add -u &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
git mv a c && git mv a c &&
git commit -m C && git commit -m C &&


git checkout -q B^0 && git checkout -q B^0 &&
git merge --no-commit -s ours C^0 && git merge --no-commit -s ours C^0 &&
git mv b newname && git mv b newname &&
git commit -m "Merge commit C^0 into HEAD" && git commit -m "Merge commit C^0 into HEAD" &&
git tag D && git tag D &&


git checkout -q C^0 && git checkout -q C^0 &&
git merge --no-commit -s ours B^0 && git merge --no-commit -s ours B^0 &&
git mv c newname && git mv c newname &&
printf "7\n8\n" >>newname && printf "7\n8\n" >>newname &&
git add -u && git add -u &&
git commit -m "Merge commit B^0 into HEAD" && git commit -m "Merge commit B^0 into HEAD" &&
git tag E git tag E
)
' '


test_expect_success 'handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify' ' test_expect_success 'handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify' '
git checkout D^0 && (
cd rename-squared-squared &&


git merge -s recursive E^0 && git checkout D^0 &&


test 1 -eq $(git ls-files -s | wc -l) && git merge -s recursive E^0 &&
test 0 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname) test 1 -eq $(git ls-files -s | wc -l) &&
test 0 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&

test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
)
' '


# #
@ -562,59 +604,63 @@ test_expect_success 'handle rename/rename(1to2)/modify followed by what looks li
# renaming carefully (both in the virtual merge base and later), and getting # renaming carefully (both in the virtual merge base and later), and getting
# content merge handled. # content merge handled.


test_expect_success 'setup criss-cross + rename/rename/add + modify/modify' ' test_expect_success 'setup criss-cross + rename/rename/add-source + modify/modify' '
git rm -rf . && test_create_repo rename-rename-add-source &&
git clean -fdqx && (
rm -rf .git && cd rename-rename-add-source &&
git init &&


printf "lots\nof\nwords\nand\ncontent\n" >a && printf "lots\nof\nwords\nand\ncontent\n" >a &&
git add a && git add a &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a b && git mv a b &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
git mv a c && git mv a c &&
printf "2\n3\n4\n5\n6\n7\n" >a && printf "2\n3\n4\n5\n6\n7\n" >a &&
git add a && git add a &&
git commit -m C && git commit -m C &&


git checkout B^0 && git checkout B^0 &&
git merge --no-commit -s ours C^0 && git merge --no-commit -s ours C^0 &&
git checkout C -- a c && git checkout C -- a c &&
mv a old_a && mv a old_a &&
echo 1 >a && echo 1 >a &&
cat old_a >>a && cat old_a >>a &&
rm old_a && rm old_a &&
git add -u && git add -u &&
git commit -m "Merge commit C^0 into HEAD" && git commit -m "Merge commit C^0 into HEAD" &&
git tag D && git tag D &&


git checkout C^0 && git checkout C^0 &&
git merge --no-commit -s ours B^0 && git merge --no-commit -s ours B^0 &&
git checkout B -- b && git checkout B -- b &&
echo 8 >>a && echo 8 >>a &&
git add -u && git add -u &&
git commit -m "Merge commit B^0 into HEAD" && git commit -m "Merge commit B^0 into HEAD" &&
git tag E git tag E
)
' '


test_expect_failure 'detect rename/rename/add-source for virtual merge-base' ' test_expect_failure 'detect rename/rename/add-source for virtual merge-base' '
git checkout D^0 && (
cd rename-rename-add-source &&


git merge -s recursive E^0 && git checkout D^0 &&


test 3 -eq $(git ls-files -s | wc -l) && git merge -s recursive E^0 &&
test 0 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse HEAD:b) = $(git rev-parse A:a) && test 3 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse HEAD:c) = $(git rev-parse A:a) && test 0 -eq $(git ls-files -u | wc -l) &&
test "$(cat a)" = "$(printf "1\n2\n3\n4\n5\n6\n7\n8\n")" test 0 -eq $(git ls-files -o | wc -l) &&

test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
test $(git rev-parse HEAD:c) = $(git rev-parse A:a) &&
test "$(cat a)" = "$(printf "1\n2\n3\n4\n5\n6\n7\n8\n")"
)
' '


# #
@ -638,52 +684,56 @@ test_expect_failure 'detect rename/rename/add-source for virtual merge-base' '
# base of B & C needs to not delete B:c for that to work, though... # base of B & C needs to not delete B:c for that to work, though...


test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' ' test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' '
git rm -rf . && test_create_repo rename-rename-add-dest &&
git clean -fdqx && (
rm -rf .git && cd rename-rename-add-dest &&
git init &&


>a && >a &&
git add a && git add a &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a b && git mv a b &&
printf "1\n2\n3\n4\n5\n6\n7\n" >c && printf "1\n2\n3\n4\n5\n6\n7\n" >c &&
git add c && git add c &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
git mv a c && git mv a c &&
git commit -m C && git commit -m C &&


git checkout B^0 && git checkout B^0 &&
git merge --no-commit -s ours C^0 && git merge --no-commit -s ours C^0 &&
git mv b a && git mv b a &&
git commit -m "D is like B but renames b back to a" && git commit -m "D is like B but renames b back to a" &&
git tag D && git tag D &&


git checkout B^0 && git checkout B^0 &&
git merge --no-commit -s ours C^0 && git merge --no-commit -s ours C^0 &&
git mv b a && git mv b a &&
echo 8 >>c && echo 8 >>c &&
git add c && git add c &&
git commit -m "E like D but has mod in c" && git commit -m "E like D but has mod in c" &&
git tag E git tag E
)
' '


test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' ' test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' '
git checkout D^0 && (
cd rename-rename-add-dest &&


git merge -s recursive E^0 && git checkout D^0 &&


test 2 -eq $(git ls-files -s | wc -l) && git merge -s recursive E^0 &&
test 0 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse HEAD:a) = $(git rev-parse A:a) && test 2 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse HEAD:c) = $(git rev-parse E:c) test 0 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&

test $(git rev-parse HEAD:a) = $(git rev-parse A:a) &&
test $(git rev-parse HEAD:c) = $(git rev-parse E:c)
)
' '


test_done test_done

797
t/t6042-merge-rename-corner-cases.sh
View File

@ -6,31 +6,40 @@ test_description="recursive merge corner cases w/ renames but not criss-crosses"
. ./test-lib.sh . ./test-lib.sh


test_expect_success 'setup rename/delete + untracked file' ' test_expect_success 'setup rename/delete + untracked file' '
echo "A pretty inscription" >ring && test_create_repo rename-delete-untracked &&
git add ring && (
test_tick && cd rename-delete-untracked &&
git commit -m beginning &&


git branch people && echo "A pretty inscription" >ring &&
git checkout -b rename-the-ring && git add ring &&
git mv ring one-ring-to-rule-them-all && test_tick &&
test_tick && git commit -m beginning &&
git commit -m fullname &&


git checkout people && git branch people &&
git rm ring && git checkout -b rename-the-ring &&
echo gollum >owner && git mv ring one-ring-to-rule-them-all &&
git add owner && test_tick &&
test_tick && git commit -m fullname &&
git commit -m track-people-instead-of-objects &&
echo "Myyy PRECIOUSSS" >ring git checkout people &&
git rm ring &&
echo gollum >owner &&
git add owner &&
test_tick &&
git commit -m track-people-instead-of-objects &&
echo "Myyy PRECIOUSSS" >ring
)
' '


test_expect_success "Does git preserve Gollum's precious artifact?" ' test_expect_success "Does git preserve Gollum's precious artifact?" '
test_must_fail git merge -s recursive rename-the-ring && (
cd rename-delete-untracked &&


# Make sure git did not delete an untracked file test_must_fail git merge -s recursive rename-the-ring &&
test -f ring
# Make sure git did not delete an untracked file
test -f ring
)
' '


# Testcase setup for rename/modify/add-source: # Testcase setup for rename/modify/add-source:
@ -41,96 +50,116 @@ test_expect_success "Does git preserve Gollum's precious artifact?" '
# We should be able to merge B & C cleanly # We should be able to merge B & C cleanly


test_expect_success 'setup rename/modify/add-source conflict' ' test_expect_success 'setup rename/modify/add-source conflict' '
git rm -rf . && test_create_repo rename-modify-add-source &&
git clean -fdqx && (
rm -rf .git && cd rename-modify-add-source &&
git init &&


printf "1\n2\n3\n4\n5\n6\n7\n" >a && printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
git add a && git add a &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
echo 8 >>a && echo 8 >>a &&
git add a && git add a &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
git mv a b && git mv a b &&
echo something completely different >a && echo something completely different >a &&
git add a && git add a &&
git commit -m C git commit -m C
)
' '


test_expect_failure 'rename/modify/add-source conflict resolvable' ' test_expect_failure 'rename/modify/add-source conflict resolvable' '
git checkout B^0 && (
cd rename-modify-add-source &&


git merge -s recursive C^0 && git checkout B^0 &&


test $(git rev-parse B:a) = $(git rev-parse b) && git merge -s recursive C^0 &&
test $(git rev-parse C:a) = $(git rev-parse a)
test $(git rev-parse B:a) = $(git rev-parse b) &&
test $(git rev-parse C:a) = $(git rev-parse a)
)
' '


test_expect_success 'setup resolvable conflict missed if rename missed' ' test_expect_success 'setup resolvable conflict missed if rename missed' '
git rm -rf . && test_create_repo break-detection-1 &&
git clean -fdqx && (
rm -rf .git && cd break-detection-1 &&
git init &&


printf "1\n2\n3\n4\n5\n" >a && printf "1\n2\n3\n4\n5\n" >a &&
echo foo >b && echo foo >b &&
git add a b && git add a b &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a c && git mv a c &&
echo "Completely different content" >a && echo "Completely different content" >a &&
git add a && git add a &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
echo 6 >>a && echo 6 >>a &&
git add a && git add a &&
git commit -m C git commit -m C
)
' '


test_expect_failure 'conflict caused if rename not detected' ' test_expect_failure 'conflict caused if rename not detected' '
git checkout -q C^0 && (
git merge -s recursive B^0 && cd break-detection-1 &&


test 3 -eq $(git ls-files -s | wc -l) && git checkout -q C^0 &&
test 0 -eq $(git ls-files -u | wc -l) && git merge -s recursive B^0 &&
test 0 -eq $(git ls-files -o | wc -l) &&


test_line_count = 6 c && test 3 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse HEAD:a) = $(git rev-parse B:a) && test 0 -eq $(git ls-files -u | wc -l) &&
test $(git rev-parse HEAD:b) = $(git rev-parse A:b) test 0 -eq $(git ls-files -o | wc -l) &&

test_line_count = 6 c &&
test $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&
test $(git rev-parse HEAD:b) = $(git rev-parse A:b)
)
' '


test_expect_success 'setup conflict resolved wrong if rename missed' ' test_expect_success 'setup conflict resolved wrong if rename missed' '
git reset --hard && test_create_repo break-detection-2 &&
git clean -f && (
cd break-detection-2 &&


git checkout -b D A && printf "1\n2\n3\n4\n5\n" >a &&
echo 7 >>a && echo foo >b &&
git add a && git add a b &&
git mv a c && git commit -m A &&
echo "Completely different content" >a && git tag A &&
git add a &&
git commit -m D &&


git checkout -b E A && git checkout -b D A &&
git rm a && echo 7 >>a &&
echo "Completely different content" >>a && git add a &&
git add a && git mv a c &&
git commit -m E echo "Completely different content" >a &&
git add a &&
git commit -m D &&

git checkout -b E A &&
git rm a &&
echo "Completely different content" >>a &&
git add a &&
git commit -m E
)
' '


test_expect_failure 'missed conflict if rename not detected' ' test_expect_failure 'missed conflict if rename not detected' '
git checkout -q E^0 && (
test_must_fail git merge -s recursive D^0 cd break-detection-2 &&

git checkout -q E^0 &&
test_must_fail git merge -s recursive D^0
)
' '


# Tests for undetected rename/add-source causing a file to erroneously be # Tests for undetected rename/add-source causing a file to erroneously be
@ -145,198 +174,210 @@ test_expect_failure 'missed conflict if rename not detected' '
# Commit C: rename a->b, add unrelated a # Commit C: rename a->b, add unrelated a


test_expect_success 'setup undetected rename/add-source causes data loss' ' test_expect_success 'setup undetected rename/add-source causes data loss' '
git rm -rf . && test_create_repo break-detection-3 &&
git clean -fdqx && (
rm -rf .git && cd break-detection-3 &&
git init &&


printf "1\n2\n3\n4\n5\n" >a && printf "1\n2\n3\n4\n5\n" >a &&
git add a && git add a &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a b && git mv a b &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
git mv a b && git mv a b &&
echo foobar >a && echo foobar >a &&
git add a && git add a &&
git commit -m C git commit -m C
)
' '


test_expect_failure 'detect rename/add-source and preserve all data' ' test_expect_failure 'detect rename/add-source and preserve all data' '
git checkout B^0 && (
cd break-detection-3 &&


git merge -s recursive C^0 && git checkout B^0 &&


test 2 -eq $(git ls-files -s | wc -l) && git merge -s recursive C^0 &&
test 2 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test -f a && test 2 -eq $(git ls-files -s | wc -l) &&
test -f b && test 2 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse HEAD:b) = $(git rev-parse A:a) && test -f a &&
test $(git rev-parse HEAD:a) = $(git rev-parse C:a) test -f b &&

test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
test $(git rev-parse HEAD:a) = $(git rev-parse C:a)
)
' '


test_expect_failure 'detect rename/add-source and preserve all data, merge other way' ' test_expect_failure 'detect rename/add-source and preserve all data, merge other way' '
git checkout C^0 && (
cd break-detection-3 &&


git merge -s recursive B^0 && git checkout C^0 &&


test 2 -eq $(git ls-files -s | wc -l) && git merge -s recursive B^0 &&
test 2 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test -f a && test 2 -eq $(git ls-files -s | wc -l) &&
test -f b && test 2 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse HEAD:b) = $(git rev-parse A:a) && test -f a &&
test $(git rev-parse HEAD:a) = $(git rev-parse C:a) test -f b &&

test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
test $(git rev-parse HEAD:a) = $(git rev-parse C:a)
)
' '


test_expect_success 'setup content merge + rename/directory conflict' ' test_expect_success 'setup content merge + rename/directory conflict' '
git rm -rf . && test_create_repo rename-directory-1 &&
git clean -fdqx && (
rm -rf .git && cd rename-directory-1 &&
git init &&


printf "1\n2\n3\n4\n5\n6\n" >file && printf "1\n2\n3\n4\n5\n6\n" >file &&
git add file && git add file &&
test_tick && test_tick &&
git commit -m base && git commit -m base &&
git tag base && git tag base &&


git checkout -b right && git checkout -b right &&
echo 7 >>file && echo 7 >>file &&
mkdir newfile && mkdir newfile &&
echo junk >newfile/realfile && echo junk >newfile/realfile &&
git add file newfile/realfile && git add file newfile/realfile &&
test_tick && test_tick &&
git commit -m right && git commit -m right &&


git checkout -b left-conflict base && git checkout -b left-conflict base &&
echo 8 >>file && echo 8 >>file &&
git add file && git add file &&
git mv file newfile && git mv file newfile &&
test_tick && test_tick &&
git commit -m left && git commit -m left &&


git checkout -b left-clean base && git checkout -b left-clean base &&
echo 0 >newfile && echo 0 >newfile &&
cat file >>newfile && cat file >>newfile &&
git add newfile && git add newfile &&
git rm file && git rm file &&
test_tick && test_tick &&
git commit -m left git commit -m left
)
' '


test_expect_success 'rename/directory conflict + clean content merge' ' test_expect_success 'rename/directory conflict + clean content merge' '
git reset --hard && (
git reset --hard && cd rename-directory-1 &&
git clean -fdqx &&


git checkout left-clean^0 && git checkout left-clean^0 &&


test_must_fail git merge -s recursive right^0 && test_must_fail git merge -s recursive right^0 &&


test 2 -eq $(git ls-files -s | wc -l) && test 2 -eq $(git ls-files -s | wc -l) &&
test 1 -eq $(git ls-files -u | wc -l) && test 1 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) && test 1 -eq $(git ls-files -o | wc -l) &&


echo 0 >expect && echo 0 >expect &&
git cat-file -p base:file >>expect && git cat-file -p base:file >>expect &&
echo 7 >>expect && echo 7 >>expect &&
test_cmp expect newfile~HEAD && test_cmp expect newfile~HEAD &&


test $(git rev-parse :2:newfile) = $(git hash-object expect) && test $(git rev-parse :2:newfile) = $(git hash-object expect) &&


test -f newfile/realfile && test -f newfile/realfile &&
test -f newfile~HEAD test -f newfile~HEAD
)
' '


test_expect_success 'rename/directory conflict + content merge conflict' ' test_expect_success 'rename/directory conflict + content merge conflict' '
git reset --hard && (
git reset --hard && cd rename-directory-1 &&
git clean -fdqx &&


git checkout left-conflict^0 && git reset --hard &&
git reset --hard &&
git clean -fdqx &&


test_must_fail git merge -s recursive right^0 && git checkout left-conflict^0 &&


test 4 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive right^0 &&
test 3 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) &&


git cat-file -p left-conflict:newfile >left && test 4 -eq $(git ls-files -s | wc -l) &&
git cat-file -p base:file >base && test 3 -eq $(git ls-files -u | wc -l) &&
git cat-file -p right:file >right && test 1 -eq $(git ls-files -o | wc -l) &&
test_must_fail git merge-file \
-L "HEAD:newfile" \
-L "" \
-L "right^0:file" \
left base right &&
test_cmp left newfile~HEAD &&


test $(git rev-parse :1:newfile) = $(git rev-parse base:file) && git cat-file -p left-conflict:newfile >left &&
test $(git rev-parse :2:newfile) = $(git rev-parse left-conflict:newfile) && git cat-file -p base:file >base &&
test $(git rev-parse :3:newfile) = $(git rev-parse right:file) && git cat-file -p right:file >right &&
test_must_fail git merge-file \
-L "HEAD:newfile" \
-L "" \
-L "right^0:file" \
left base right &&
test_cmp left newfile~HEAD &&


test -f newfile/realfile && test $(git rev-parse :1:newfile) = $(git rev-parse base:file) &&
test -f newfile~HEAD test $(git rev-parse :2:newfile) = $(git rev-parse left-conflict:newfile) &&
test $(git rev-parse :3:newfile) = $(git rev-parse right:file) &&

test -f newfile/realfile &&
test -f newfile~HEAD
)
' '


test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' ' test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' '
git reset --hard && test_create_repo rename-directory-2 &&
git rm -rf . && (
git clean -fdqx && cd rename-directory-2 &&
rm -rf .git &&
git init &&


mkdir sub && mkdir sub &&
printf "1\n2\n3\n4\n5\n6\n" >sub/file && printf "1\n2\n3\n4\n5\n6\n" >sub/file &&
git add sub/file && git add sub/file &&
test_tick && test_tick &&
git commit -m base && git commit -m base &&
git tag base && git tag base &&


git checkout -b right && git checkout -b right &&
echo 7 >>sub/file && echo 7 >>sub/file &&
git add sub/file && git add sub/file &&
test_tick && test_tick &&
git commit -m right && git commit -m right &&


git checkout -b left base && git checkout -b left base &&
echo 0 >newfile && echo 0 >newfile &&
cat sub/file >>newfile && cat sub/file >>newfile &&
git rm sub/file && git rm sub/file &&
mv newfile sub && mv newfile sub &&
git add sub && git add sub &&
test_tick && test_tick &&
git commit -m left git commit -m left
)
' '


test_expect_success 'disappearing dir in rename/directory conflict handled' ' test_expect_success 'disappearing dir in rename/directory conflict handled' '
git reset --hard && (
git clean -fdqx && cd rename-directory-2 &&


git checkout left^0 && git checkout left^0 &&


git merge -s recursive right^0 && git merge -s recursive right^0 &&


test 1 -eq $(git ls-files -s | wc -l) && test 1 -eq $(git ls-files -s | wc -l) &&
test 0 -eq $(git ls-files -u | wc -l) && test 0 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) && test 0 -eq $(git ls-files -o | wc -l) &&


echo 0 >expect && echo 0 >expect &&
git cat-file -p base:sub/file >>expect && git cat-file -p base:sub/file >>expect &&
echo 7 >>expect && echo 7 >>expect &&
test_cmp expect sub && test_cmp expect sub &&


test -f sub test -f sub
)
' '


# Test for all kinds of things that can go wrong with rename/rename (2to1): # Test for all kinds of things that can go wrong with rename/rename (2to1):
@ -352,48 +393,52 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '
# * Nothing else should be present. Is anything? # * Nothing else should be present. Is anything?


test_expect_success 'setup rename/rename (2to1) + modify/modify' ' test_expect_success 'setup rename/rename (2to1) + modify/modify' '
git rm -rf . && test_create_repo rename-rename-2to1 &&
git clean -fdqx && (
rm -rf .git && cd rename-rename-2to1 &&
git init &&


printf "1\n2\n3\n4\n5\n" >a && printf "1\n2\n3\n4\n5\n" >a &&
printf "5\n4\n3\n2\n1\n" >b && printf "5\n4\n3\n2\n1\n" >b &&
git add a b && git add a b &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a c && git mv a c &&
echo 0 >>b && echo 0 >>b &&
git add b && git add b &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
git mv b c && git mv b c &&
echo 6 >>a && echo 6 >>a &&
git add a && git add a &&
git commit -m C git commit -m C
)
' '


test_expect_success 'handle rename/rename (2to1) conflict correctly' ' test_expect_success 'handle rename/rename (2to1) conflict correctly' '
git checkout B^0 && (
cd rename-rename-2to1 &&


test_must_fail git merge -s recursive C^0 >out && git checkout B^0 &&
test_i18ngrep "CONFLICT (rename/rename)" out &&


test 2 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive C^0 >out &&
test 2 -eq $(git ls-files -u | wc -l) && test_i18ngrep "CONFLICT (rename/rename)" out &&
test 2 -eq $(git ls-files -u c | wc -l) &&
test 3 -eq $(git ls-files -o | wc -l) &&


test ! -f a && test 2 -eq $(git ls-files -s | wc -l) &&
test ! -f b && test 2 -eq $(git ls-files -u | wc -l) &&
test -f c~HEAD && test 2 -eq $(git ls-files -u c | wc -l) &&
test -f c~C^0 && test 3 -eq $(git ls-files -o | wc -l) &&


test $(git hash-object c~HEAD) = $(git rev-parse C:a) && test ! -f a &&
test $(git hash-object c~C^0) = $(git rev-parse B:b) test ! -f b &&
test -f c~HEAD &&
test -f c~C^0 &&

test $(git hash-object c~HEAD) = $(git rev-parse C:a) &&
test $(git hash-object c~C^0) = $(git rev-parse B:b)
)
' '


# Testcase setup for simple rename/rename (1to2) conflict: # Testcase setup for simple rename/rename (1to2) conflict:
@ -401,44 +446,48 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
# Commit B: rename a->b # Commit B: rename a->b
# Commit C: rename a->c # Commit C: rename a->c
test_expect_success 'setup simple rename/rename (1to2) conflict' ' test_expect_success 'setup simple rename/rename (1to2) conflict' '
git rm -rf . && test_create_repo rename-rename-1to2 &&
git clean -fdqx && (
rm -rf .git && cd rename-rename-1to2 &&
git init &&


echo stuff >a && echo stuff >a &&
git add a && git add a &&
test_tick && test_tick &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a b && git mv a b &&
test_tick && test_tick &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
git mv a c && git mv a c &&
test_tick && test_tick &&
git commit -m C git commit -m C
)
' '


test_expect_success 'merge has correct working tree contents' ' test_expect_success 'merge has correct working tree contents' '
git checkout C^0 && (
cd rename-rename-1to2 &&


test_must_fail git merge -s recursive B^0 && git checkout C^0 &&


test 3 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive B^0 &&
test 3 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse :1:a) = $(git rev-parse A:a) && test 3 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse :3:b) = $(git rev-parse A:a) && test 3 -eq $(git ls-files -u | wc -l) &&
test $(git rev-parse :2:c) = $(git rev-parse A:a) && test 0 -eq $(git ls-files -o | wc -l) &&


test ! -f a && test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
test $(git hash-object b) = $(git rev-parse A:a) && test $(git rev-parse :3:b) = $(git rev-parse A:a) &&
test $(git hash-object c) = $(git rev-parse A:a) test $(git rev-parse :2:c) = $(git rev-parse A:a) &&

test ! -f a &&
test $(git hash-object b) = $(git rev-parse A:a) &&
test $(git hash-object c) = $(git rev-parse A:a)
)
' '


# Testcase setup for rename/rename(1to2)/add-source conflict: # Testcase setup for rename/rename(1to2)/add-source conflict:
@ -449,130 +498,142 @@ test_expect_success 'merge has correct working tree contents' '
# Merging of B & C should NOT be clean; there's a rename/rename conflict # Merging of B & C should NOT be clean; there's a rename/rename conflict


test_expect_success 'setup rename/rename(1to2)/add-source conflict' ' test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
git rm -rf . && test_create_repo rename-rename-1to2-add-source-1 &&
git clean -fdqx && (
rm -rf .git && cd rename-rename-1to2-add-source-1 &&
git init &&


printf "1\n2\n3\n4\n5\n6\n7\n" >a && printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
git add a && git add a &&
git commit -m A && git commit -m A &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a b && git mv a b &&
git commit -m B && git commit -m B &&


git checkout -b C A && git checkout -b C A &&
git mv a c && git mv a c &&
echo something completely different >a && echo something completely different >a &&
git add a && git add a &&
git commit -m C git commit -m C
)
' '


test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' ' test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' '
git checkout B^0 && (
cd rename-rename-1to2-add-source-1 &&


test_must_fail git merge -s recursive C^0 && git checkout B^0 &&


test 4 -eq $(git ls-files -s | wc -l) && test_must_fail git merge -s recursive C^0 &&
test 0 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse 3:a) = $(git rev-parse C:a) && test 4 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse 1:a) = $(git rev-parse A:a) && test 0 -eq $(git ls-files -o | wc -l) &&
test $(git rev-parse 2:b) = $(git rev-parse B:b) &&
test $(git rev-parse 3:c) = $(git rev-parse C:c) &&


test -f a && test $(git rev-parse 3:a) = $(git rev-parse C:a) &&
test -f b && test $(git rev-parse 1:a) = $(git rev-parse A:a) &&
test -f c test $(git rev-parse 2:b) = $(git rev-parse B:b) &&
test $(git rev-parse 3:c) = $(git rev-parse C:c) &&

test -f a &&
test -f b &&
test -f c
)
' '


test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' ' test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
git rm -rf . && test_create_repo rename-rename-1to2-add-source-2 &&
git clean -fdqx && (
rm -rf .git && cd rename-rename-1to2-add-source-2 &&
git init &&


>a && >a &&
git add a && git add a &&
test_tick && test_tick &&
git commit -m base && git commit -m base &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a b && git mv a b &&
test_tick && test_tick &&
git commit -m one && git commit -m one &&


git checkout -b C A && git checkout -b C A &&
git mv a b && git mv a b &&
echo important-info >a && echo important-info >a &&
git add a && git add a &&
test_tick && test_tick &&
git commit -m two git commit -m two
)
' '


test_expect_failure 'rename/rename/add-source still tracks new a file' ' test_expect_failure 'rename/rename/add-source still tracks new a file' '
git checkout C^0 && (
git merge -s recursive B^0 && cd rename-rename-1to2-add-source-2 &&


test 2 -eq $(git ls-files -s | wc -l) && git checkout C^0 &&
test 0 -eq $(git ls-files -o | wc -l) && git merge -s recursive B^0 &&


test $(git rev-parse HEAD:a) = $(git rev-parse C:a) && test 2 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse HEAD:b) = $(git rev-parse A:a) test 0 -eq $(git ls-files -o | wc -l) &&

test $(git rev-parse HEAD:a) = $(git rev-parse C:a) &&
test $(git rev-parse HEAD:b) = $(git rev-parse A:a)
)
' '


test_expect_success 'setup rename/rename(1to2)/add-dest conflict' ' test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
git rm -rf . && test_create_repo rename-rename-1to2-add-dest &&
git clean -fdqx && (
rm -rf .git && cd rename-rename-1to2-add-dest &&
git init &&


echo stuff >a && echo stuff >a &&
git add a && git add a &&
test_tick && test_tick &&
git commit -m base && git commit -m base &&
git tag A && git tag A &&


git checkout -b B A && git checkout -b B A &&
git mv a b && git mv a b &&
echo precious-data >c && echo precious-data >c &&
git add c && git add c &&
test_tick && test_tick &&
git commit -m one && git commit -m one &&


git checkout -b C A && git checkout -b C A &&
git mv a c && git mv a c &&
echo important-info >b && echo important-info >b &&
git add b && git add b &&
test_tick && test_tick &&
git commit -m two git commit -m two
)
' '


test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' ' test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
git checkout C^0 && (
test_must_fail git merge -s recursive B^0 && cd rename-rename-1to2-add-dest &&


test 5 -eq $(git ls-files -s | wc -l) && git checkout C^0 &&
test 2 -eq $(git ls-files -u b | wc -l) && test_must_fail git merge -s recursive B^0 &&
test 2 -eq $(git ls-files -u c | wc -l) &&
test 4 -eq $(git ls-files -o | wc -l) &&


test $(git rev-parse :1:a) = $(git rev-parse A:a) && test 5 -eq $(git ls-files -s | wc -l) &&
test $(git rev-parse :2:b) = $(git rev-parse C:b) && test 2 -eq $(git ls-files -u b | wc -l) &&
test $(git rev-parse :3:b) = $(git rev-parse B:b) && test 2 -eq $(git ls-files -u c | wc -l) &&
test $(git rev-parse :2:c) = $(git rev-parse C:c) && test 4 -eq $(git ls-files -o | wc -l) &&
test $(git rev-parse :3:c) = $(git rev-parse B:c) &&


test $(git hash-object c~HEAD) = $(git rev-parse C:c) && test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
test $(git hash-object c~B\^0) = $(git rev-parse B:c) && test $(git rev-parse :2:b) = $(git rev-parse C:b) &&
test $(git hash-object b~HEAD) = $(git rev-parse C:b) && test $(git rev-parse :3:b) = $(git rev-parse B:b) &&
test $(git hash-object b~B\^0) = $(git rev-parse B:b) && test $(git rev-parse :2:c) = $(git rev-parse C:c) &&
test $(git rev-parse :3:c) = $(git rev-parse B:c) &&


test ! -f b && test $(git hash-object c~HEAD) = $(git rev-parse C:c) &&
test ! -f c test $(git hash-object c~B\^0) = $(git rev-parse B:c) &&
test $(git hash-object b~HEAD) = $(git rev-parse C:b) &&
test $(git hash-object b~B\^0) = $(git rev-parse B:b) &&

test ! -f b &&
test ! -f c
)
' '


test_done test_done