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

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 7 years ago committed by Junio C Hamano
parent
e144d126d7
commit
2a4c19efbf
2 changed files with 926 additions and 815 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 854
      t/t6036-recursive-corner-cases.sh
  2. 887
      t/t6042-merge-rename-corner-cases.sh

854
t/t6036-recursive-corner-cases.sh
Unescape View File

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

test_expect_success 'setup basic criss-cross + rename with no modifications' '
ten="0 1 2 3 4 5 6 7 8 9" &&
for i in $ten
do
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 &&
git checkout -b R1 &&
git mv one three &&
test_tick && git commit -m R1 &&

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

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

git checkout R1^0 &&
test_tick && git merge -s ours L1 &&
git tag R2
test_create_repo basic-rename &&
(
cd basic-rename &&

ten="0 1 2 3 4 5 6 7 8 9" &&
for i in $ten
do
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 &&
git checkout -b R1 &&
git mv one three &&
test_tick && git commit -m R1 &&

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

git checkout L1^0 &&
test_tick && git merge -s ours R1 &&
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' '
git reset --hard &&
git checkout L2^0 &&
(
cd basic-rename &&

git reset --hard &&
git checkout L2^0 &&

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

test 2 = $(git ls-files -s | wc -l) &&
test 2 = $(git ls-files -u | wc -l) &&
test 2 = $(git ls-files -o | wc -l) &&
test 2 = $(git ls-files -s | wc -l) &&
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 $(git rev-parse :3:three) = $(git rev-parse R2:three) &&
test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
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)
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' ' @@ -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' '
git rm -rf . &&
git clean -fdqx &&
rm -rf .git &&
git init &&

ten="0 1 2 3 4 5 6 7 8 9" &&
for i in $ten
do
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 &&
git checkout -b R1 &&
git mv one three &&
echo more >>two &&
git add two &&
test_tick && git commit -m R1 &&

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

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

git checkout R1^0 &&
test_tick && git merge -s ours L1 &&
git tag R2
test_create_repo rename-modify &&
(
cd rename-modify &&

ten="0 1 2 3 4 5 6 7 8 9" &&
for i in $ten
do
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 &&
git checkout -b R1 &&
git mv one three &&
echo more >>two &&
git add two &&
test_tick && git commit -m R1 &&

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

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

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

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

git checkout L2^0 &&

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

test 2 = $(git ls-files -s | wc -l) &&
test 2 = $(git ls-files -u | wc -l) &&
test 2 = $(git ls-files -o | wc -l) &&
test 2 = $(git ls-files -s | wc -l) &&
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 $(git rev-parse :3:three) = $(git rev-parse R2:three) &&
test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
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)
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' @@ -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' '
git rm -rf . &&
git clean -fdqx &&
rm -rf .git &&
git init &&

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

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

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

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

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

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

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

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

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

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

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

test_must_fail git merge -s recursive E^0 &&

test 3 = $(git ls-files -s | wc -l) &&
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 $(git rev-parse :3:new_a) = $(git rev-parse E:new_a) &&

git cat-file -p B:new_a >>merged &&
git cat-file -p C:new_a >>merge-me &&
>empty &&
test_must_fail git merge-file \
-L "Temporary merge branch 2" \
-L "" \
-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)
(
cd rename-add &&

git checkout D^0 &&

test_must_fail git merge -s recursive E^0 &&

test 3 = $(git ls-files -s | wc -l) &&
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 $(git rev-parse :3:new_a) = $(git rev-parse E:new_a) &&

git cat-file -p B:new_a >>merged &&
git cat-file -p C:new_a >>merge-me &&
>empty &&
test_must_fail git merge-file \
-L "Temporary merge branch 2" \
-L "" \
-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' ' @@ -236,67 +251,75 @@ test_expect_success 'git detects differently handled merges conflict' '
# Merging commits D & E should result in modify/delete conflict.

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

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

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

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

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

git checkout C^0 &&
test_must_fail git merge B &&
git rm file &&
test_tick &&
git commit -m E &&
git tag E
test_create_repo modify-delete &&
(
cd modify-delete &&

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

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

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

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

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

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

git checkout D^0 &&

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

test 2 -eq $(git ls-files -s | wc -l) &&
test 2 -eq $(git ls-files -u | wc -l) &&
test 2 -eq $(git ls-files -s | wc -l) &&
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 $(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' '
git reset --hard &&
git checkout E^0 &&
(
cd modify-delete &&

git reset --hard &&
git checkout E^0 &&

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

test 2 -eq $(git ls-files -s | wc -l) &&
test 2 -eq $(git ls-files -u | wc -l) &&
test 2 -eq $(git ls-files -s | wc -l) &&
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)
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 @@ -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' '
git rm -rf . &&
git clean -fdqx &&
rm -rf .git &&
git init &&

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

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

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

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

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

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

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

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

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

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

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

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

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 1 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&
test_must_fail git merge -s recursive E1^0 &&

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 2 -eq $(git ls-files -s | wc -l) &&
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' '
get_clean_checkout E1^0 &&
(
cd directory-file &&

get_clean_checkout E1^0 &&

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

test 2 -eq $(git ls-files -s | wc -l) &&
test 1 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&
test 2 -eq $(git ls-files -s | wc -l) &&
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 $(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' '
get_clean_checkout D^0 &&
(
cd directory-file &&

get_clean_checkout D^0 &&

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

test 4 -eq $(git ls-files -s | wc -l) &&
test 3 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) &&
test 4 -eq $(git ls-files -s | wc -l) &&
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 $(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 $(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 -f a~HEAD
)
'

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 3 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) &&
test_must_fail git merge -s recursive 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 4 -eq $(git ls-files -s | wc -l) &&
test 3 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) &&

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' ' @@ -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".

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

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

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

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

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

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

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

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

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

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

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

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) &&
test 0 -eq $(git ls-files -u | wc -l) &&
test 0 -eq $(git ls-files -o | wc -l) &&
git merge -s recursive E^0 &&

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 @@ -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
# content merge handled.

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

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

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

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

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

git checkout C^0 &&
git merge --no-commit -s ours B^0 &&
git checkout B -- b &&
echo 8 >>a &&
git add -u &&
git commit -m "Merge commit B^0 into HEAD" &&
git tag E
test_expect_success 'setup criss-cross + rename/rename/add-source + modify/modify' '
test_create_repo rename-rename-add-source &&
(
cd rename-rename-add-source &&

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

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

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

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

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

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

git checkout D^0 &&

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

test 3 -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 3 -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: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")"
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' ' @@ -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...

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

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

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

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

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

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

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

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

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

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

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

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

git checkout D^0 &&

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

test 2 -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 2 -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:a) = $(git rev-parse A:a) &&
test $(git rev-parse HEAD:c) = $(git rev-parse E:c)
test $(git rev-parse HEAD:a) = $(git rev-parse A:a) &&
test $(git rev-parse HEAD:c) = $(git rev-parse E:c)
)
'

test_done

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

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save