Merge branch 'en/merge-recursive-tests'
Clean up tests in t6xxx series about 'merge' command. * en/merge-recursive-tests: t6036: prefer test_when_finished to manual cleanup in following test t6036, t6042: prefer test_cmp to sequences of test t6036, t6042: prefer test_path_is_file, test_path_is_missing t6036, t6042: use test_line_count instead of wc -l t6036, t6042: use test_create_repo to keep tests independentmaint
Junio C Hamano
commit
93b74a7cfa
|
|
@ -4,12 +4,6 @@ test_description='recursive merge corner cases involving criss-cross merges'
|
||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
get_clean_checkout () {
|
|
||||||
git reset --hard &&
|
|
||||||
git clean -fdqx &&
|
|
||||||
git checkout "$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# L1 L2
|
# L1 L2
|
||||||
# o---o
|
# o---o
|
||||||
|
|
@ -21,6 +15,10 @@ 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' '
|
||||||
|
test_create_repo basic-rename &&
|
||||||
|
(
|
||||||
|
cd basic-rename &&
|
||||||
|
|
||||||
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
|
||||||
|
|
@ -49,23 +47,34 @@ test_expect_success 'setup basic criss-cross + rename with no modifications' '
|
||||||
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 simple rename+criss-cross with no modifications' '
|
test_expect_success 'merge simple rename+criss-cross with no modifications' '
|
||||||
|
(
|
||||||
|
cd basic-rename &&
|
||||||
|
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
git checkout L2^0 &&
|
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) &&
|
git ls-files -s >out &&
|
||||||
test 2 = $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 2 = $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 3 out &&
|
||||||
|
|
||||||
test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :3:three) = $(git rev-parse R2:three) &&
|
L2:three R2:three \
|
||||||
|
L2:three R2:three &&
|
||||||
test $(git rev-parse L2:three) = $(git hash-object three~HEAD) &&
|
git rev-parse >actual \
|
||||||
test $(git rev-parse R2:three) = $(git hash-object three~R2^0)
|
:2:three :3:three &&
|
||||||
|
git hash-object >>actual \
|
||||||
|
three~HEAD three~R2^0
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -81,10 +90,9 @@ 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
|
||||||
|
|
@ -116,23 +124,33 @@ test_expect_success 'setup criss-cross + rename merges with basic modification'
|
||||||
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 &&
|
(
|
||||||
|
cd rename-modify &&
|
||||||
|
|
||||||
git checkout L2^0 &&
|
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) &&
|
git ls-files -s >out &&
|
||||||
test 2 = $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 2 = $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 3 out &&
|
||||||
|
|
||||||
test $(git rev-parse :2:three) = $(git rev-parse L2:three) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :3:three) = $(git rev-parse R2:three) &&
|
L2:three R2:three \
|
||||||
|
L2:three R2:three &&
|
||||||
test $(git rev-parse L2:three) = $(git hash-object three~HEAD) &&
|
git rev-parse >actual \
|
||||||
test $(git rev-parse R2:three) = $(git hash-object three~R2^0)
|
:2:three :3:three &&
|
||||||
|
git hash-object >>actual \
|
||||||
|
three~HEAD three~R2^0
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -156,10 +174,9 @@ 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 &&
|
||||||
|
|
@ -189,31 +206,42 @@ test_expect_success 'setup differently handled merges of rename/add conflict' '
|
||||||
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 &&
|
(
|
||||||
|
cd rename-add &&
|
||||||
|
|
||||||
git checkout D^0 &&
|
git checkout D^0 &&
|
||||||
|
|
||||||
test_must_fail git merge -s recursive E^0 &&
|
test_must_fail git merge -s recursive E^0 &&
|
||||||
|
|
||||||
test 3 = $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 3 = $(git ls-files -u | wc -l) &&
|
test_line_count = 3 out &&
|
||||||
test 0 = $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 3 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse :2:new_a) = $(git rev-parse D:new_a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :3:new_a) = $(git rev-parse E:new_a) &&
|
D:new_a E:new_a &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:2:new_a :3:new_a &&
|
||||||
|
test_cmp expect actual
|
||||||
|
|
||||||
git cat-file -p B:new_a >>merged &&
|
git cat-file -p B:new_a >ours &&
|
||||||
git cat-file -p C:new_a >>merge-me &&
|
git cat-file -p C:new_a >theirs &&
|
||||||
>empty &&
|
>empty &&
|
||||||
test_must_fail git merge-file \
|
test_must_fail git merge-file \
|
||||||
-L "Temporary merge branch 2" \
|
-L "Temporary merge branch 2" \
|
||||||
-L "" \
|
-L "" \
|
||||||
-L "Temporary merge branch 1" \
|
-L "Temporary merge branch 1" \
|
||||||
merged empty merge-me &&
|
ours empty theirs &&
|
||||||
sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal &&
|
sed -e "s/^\([<=>]\)/\1\1\1/" ours >expect &&
|
||||||
test $(git rev-parse :1:new_a) = $(git hash-object merged-internal)
|
git cat-file -p :1:new_a >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -236,10 +264,9 @@ 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 &&
|
||||||
|
|
@ -272,31 +299,50 @@ test_expect_success 'setup criss-cross + modify/delete resolved differently' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd modify-delete &&
|
||||||
|
|
||||||
git checkout D^0 &&
|
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) &&
|
git ls-files -s >out &&
|
||||||
test 2 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
|
||||||
test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :2:file) = $(git rev-parse B:file)
|
master:file B:file &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:1:file :2:file &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd modify-delete &&
|
||||||
|
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
git checkout E^0 &&
|
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) &&
|
git ls-files -s >out &&
|
||||||
test 2 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
|
||||||
test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :3:file) = $(git rev-parse B:file)
|
master:file B:file &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:1:file :3:file &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -336,10 +382,9 @@ 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 &&
|
||||||
|
|
@ -390,66 +435,111 @@ test_expect_success 'setup differently handled merges of directory/file conflict
|
||||||
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 &&
|
test_when_finished "git -C directory-file reset --hard" &&
|
||||||
|
test_when_finished "git -C directory-file clean -fdqx" &&
|
||||||
|
(
|
||||||
|
cd directory-file &&
|
||||||
|
|
||||||
|
git checkout D^0 &&
|
||||||
|
|
||||||
test_must_fail git merge -s recursive E1^0 &&
|
test_must_fail git merge -s recursive E1^0 &&
|
||||||
|
|
||||||
test 2 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 1 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :2:a) = $(git rev-parse B:a)
|
A:ignore-me B:a &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:ignore-me :2:a &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
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 &&
|
test_when_finished "git -C directory-file reset --hard" &&
|
||||||
|
test_when_finished "git -C directory-file clean -fdqx" &&
|
||||||
|
(
|
||||||
|
cd directory-file &&
|
||||||
|
|
||||||
|
git 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) &&
|
git ls-files -s >out &&
|
||||||
test 1 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :3:a) = $(git rev-parse B:a)
|
A:ignore-me B:a &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:ignore-me :3:a &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
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 &&
|
test_when_finished "git -C directory-file reset --hard" &&
|
||||||
|
test_when_finished "git -C directory-file clean -fdqx" &&
|
||||||
|
(
|
||||||
|
cd directory-file &&
|
||||||
|
|
||||||
|
git 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) &&
|
git ls-files -s >out &&
|
||||||
test 3 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 4 out &&
|
||||||
test 1 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 3 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
|
||||||
test $(git rev-parse :2:a) = $(git rev-parse B:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :3:a/file) = $(git rev-parse E2:a/file) &&
|
B:a E2:a/file c:a/file A:ignore-me &&
|
||||||
test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) &&
|
git rev-parse >actual \
|
||||||
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
|
:2:a :3:a/file :1:a/file :0:ignore-me &&
|
||||||
|
test_cmp expect actual
|
||||||
|
|
||||||
test -f a~HEAD
|
test_path_is_file 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 &&
|
test_when_finished "git -C directory-file reset --hard" &&
|
||||||
|
test_when_finished "git -C directory-file clean -fdqx" &&
|
||||||
|
(
|
||||||
|
cd directory-file &&
|
||||||
|
|
||||||
|
git checkout E2^0 &&
|
||||||
|
|
||||||
test_must_fail git merge -s recursive D^0 &&
|
test_must_fail git merge -s recursive D^0 &&
|
||||||
|
|
||||||
test 4 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 3 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 4 out &&
|
||||||
test 1 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 3 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
|
||||||
test $(git rev-parse :3:a) = $(git rev-parse B:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :2:a/file) = $(git rev-parse E2:a/file) &&
|
B:a E2:a/file c:a/file A:ignore-me &&
|
||||||
test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) &&
|
git rev-parse >actual \
|
||||||
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
|
:3:a :2:a/file :1:a/file :0:ignore-me &&
|
||||||
|
test_cmp expect actual
|
||||||
|
|
||||||
test -f a~D^0
|
test_path_is_file a~D^0
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -492,11 +582,9 @@ 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 &&
|
||||||
|
|
@ -526,18 +614,26 @@ test_expect_success 'setup rename/rename(1to2)/modify followed by what looks lik
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-squared-squared &&
|
||||||
|
|
||||||
git checkout D^0 &&
|
git checkout D^0 &&
|
||||||
|
|
||||||
git merge -s recursive E^0 &&
|
git merge -s recursive E^0 &&
|
||||||
|
|
||||||
test 1 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 0 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 1 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 0 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
|
test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -562,11 +658,10 @@ 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 &&
|
||||||
|
|
@ -601,20 +696,34 @@ test_expect_success 'setup criss-cross + rename/rename/add + modify/modify' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-rename-add-source &&
|
||||||
|
|
||||||
git checkout D^0 &&
|
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) &&
|
git ls-files -s >out &&
|
||||||
test 0 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 3 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 0 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
|
printf "1\n2\n3\n4\n5\n6\n7\n8\n" >correct &&
|
||||||
test $(git rev-parse HEAD:c) = $(git rev-parse A:a) &&
|
git rev-parse >expect \
|
||||||
test "$(cat a)" = "$(printf "1\n2\n3\n4\n5\n6\n7\n8\n")"
|
A:a A:a \
|
||||||
|
correct &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:b :0:c &&
|
||||||
|
git hash-object >>actual \
|
||||||
|
a &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -638,10 +747,9 @@ 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 &&
|
||||||
|
|
@ -671,19 +779,30 @@ test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-rename-add-dest &&
|
||||||
|
|
||||||
git checkout D^0 &&
|
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) &&
|
git ls-files -s >out &&
|
||||||
test 0 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 0 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse HEAD:a) = $(git rev-parse A:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse HEAD:c) = $(git rev-parse E:c)
|
A:a E:c &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:a :0:c &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,10 @@ 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' '
|
||||||
|
test_create_repo rename-delete-untracked &&
|
||||||
|
(
|
||||||
|
cd rename-delete-untracked &&
|
||||||
|
|
||||||
echo "A pretty inscription" >ring &&
|
echo "A pretty inscription" >ring &&
|
||||||
git add ring &&
|
git add ring &&
|
||||||
test_tick &&
|
test_tick &&
|
||||||
|
|
@ -24,13 +28,18 @@ test_expect_success 'setup rename/delete + untracked file' '
|
||||||
test_tick &&
|
test_tick &&
|
||||||
git commit -m track-people-instead-of-objects &&
|
git commit -m track-people-instead-of-objects &&
|
||||||
echo "Myyy PRECIOUSSS" >ring
|
echo "Myyy PRECIOUSSS" >ring
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success "Does git preserve Gollum's precious artifact?" '
|
test_expect_success "Does git preserve Gollum's precious artifact?" '
|
||||||
|
(
|
||||||
|
cd rename-delete-untracked &&
|
||||||
|
|
||||||
test_must_fail git merge -s recursive rename-the-ring &&
|
test_must_fail git merge -s recursive rename-the-ring &&
|
||||||
|
|
||||||
# Make sure git did not delete an untracked file
|
# Make sure git did not delete an untracked file
|
||||||
test -f ring
|
test_path_is_file ring
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
# Testcase setup for rename/modify/add-source:
|
# Testcase setup for rename/modify/add-source:
|
||||||
|
|
@ -41,10 +50,9 @@ 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 &&
|
||||||
|
|
@ -61,22 +69,29 @@ test_expect_success 'setup rename/modify/add-source conflict' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-modify-add-source &&
|
||||||
|
|
||||||
git checkout B^0 &&
|
git checkout B^0 &&
|
||||||
|
|
||||||
git merge -s recursive C^0 &&
|
git merge -s recursive C^0 &&
|
||||||
|
|
||||||
test $(git rev-parse B:a) = $(git rev-parse b) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse C:a) = $(git rev-parse a)
|
B:a C:a &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
b c &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
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 &&
|
||||||
|
|
@ -94,24 +109,42 @@ test_expect_success 'setup resolvable conflict missed if rename missed' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd break-detection-1 &&
|
||||||
|
|
||||||
git checkout -q C^0 &&
|
git checkout -q C^0 &&
|
||||||
git merge -s recursive B^0 &&
|
git merge -s recursive B^0 &&
|
||||||
|
|
||||||
test 3 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 0 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 3 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 0 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test_line_count = 6 c &&
|
test_line_count = 6 c &&
|
||||||
test $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse HEAD:b) = $(git rev-parse A:b)
|
B:a A:b &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:a :0:b &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
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 &&
|
||||||
|
|
||||||
|
printf "1\n2\n3\n4\n5\n" >a &&
|
||||||
|
echo foo >b &&
|
||||||
|
git add a b &&
|
||||||
|
git commit -m A &&
|
||||||
|
git tag A &&
|
||||||
|
|
||||||
git checkout -b D A &&
|
git checkout -b D A &&
|
||||||
echo 7 >>a &&
|
echo 7 >>a &&
|
||||||
|
|
@ -126,11 +159,16 @@ test_expect_success 'setup conflict resolved wrong if rename missed' '
|
||||||
echo "Completely different content" >>a &&
|
echo "Completely different content" >>a &&
|
||||||
git add a &&
|
git add a &&
|
||||||
git commit -m E
|
git commit -m E
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_failure 'missed conflict if rename not detected' '
|
test_expect_failure 'missed conflict if rename not detected' '
|
||||||
|
(
|
||||||
|
cd break-detection-2 &&
|
||||||
|
|
||||||
git checkout -q E^0 &&
|
git checkout -q E^0 &&
|
||||||
test_must_fail git merge -s recursive D^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,10 +183,9 @@ 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 &&
|
||||||
|
|
@ -164,45 +201,65 @@ test_expect_success 'setup undetected rename/add-source causes data loss' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd break-detection-3 &&
|
||||||
|
|
||||||
git checkout B^0 &&
|
git checkout B^0 &&
|
||||||
|
|
||||||
git merge -s recursive C^0 &&
|
git merge -s recursive C^0 &&
|
||||||
|
|
||||||
test 2 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 2 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test -f a &&
|
test_path_is_file a &&
|
||||||
test -f b &&
|
test_path_is_file b &&
|
||||||
|
|
||||||
test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse HEAD:a) = $(git rev-parse C:a)
|
A:a C:a &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:b :0:a &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd break-detection-3 &&
|
||||||
|
|
||||||
git checkout C^0 &&
|
git checkout C^0 &&
|
||||||
|
|
||||||
git merge -s recursive B^0 &&
|
git merge -s recursive B^0 &&
|
||||||
|
|
||||||
test 2 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 2 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test -f a &&
|
test_path_is_file a &&
|
||||||
test -f b &&
|
test_path_is_file b &&
|
||||||
|
|
||||||
test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse HEAD:a) = $(git rev-parse C:a)
|
A:a C:a &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:b :0:a &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
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 &&
|
||||||
|
|
@ -232,20 +289,23 @@ test_expect_success 'setup content merge + rename/directory conflict' '
|
||||||
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) &&
|
git ls-files -s >out &&
|
||||||
test 1 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 1 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
|
||||||
echo 0 >expect &&
|
echo 0 >expect &&
|
||||||
git cat-file -p base:file >>expect &&
|
git cat-file -p base:file >>expect &&
|
||||||
|
|
@ -254,11 +314,15 @@ test_expect_success 'rename/directory conflict + clean content merge' '
|
||||||
|
|
||||||
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_path_is_file newfile/realfile &&
|
||||||
test -f newfile~HEAD
|
test_path_is_file newfile~HEAD
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'rename/directory conflict + content merge conflict' '
|
test_expect_success 'rename/directory conflict + content merge conflict' '
|
||||||
|
(
|
||||||
|
cd rename-directory-1 &&
|
||||||
|
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
git clean -fdqx &&
|
git clean -fdqx &&
|
||||||
|
|
@ -267,9 +331,12 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
|
||||||
|
|
||||||
test_must_fail git merge -s recursive right^0 &&
|
test_must_fail git merge -s recursive right^0 &&
|
||||||
|
|
||||||
test 4 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 3 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 4 out &&
|
||||||
test 1 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 3 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
|
||||||
git cat-file -p left-conflict:newfile >left &&
|
git cat-file -p left-conflict:newfile >left &&
|
||||||
git cat-file -p base:file >base &&
|
git cat-file -p base:file >base &&
|
||||||
|
|
@ -281,20 +348,21 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
|
||||||
left base right &&
|
left base right &&
|
||||||
test_cmp left newfile~HEAD &&
|
test_cmp left newfile~HEAD &&
|
||||||
|
|
||||||
test $(git rev-parse :1:newfile) = $(git rev-parse base:file) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :2:newfile) = $(git rev-parse left-conflict:newfile) &&
|
base:file left-conflict:newfile right:file &&
|
||||||
test $(git rev-parse :3:newfile) = $(git rev-parse right:file) &&
|
git rev-parse >actual \
|
||||||
|
:1:newfile :2:newfile :3:newfile &&
|
||||||
|
test_cmp expect actual
|
||||||
|
|
||||||
test -f newfile/realfile &&
|
test_path_is_file newfile/realfile &&
|
||||||
test -f newfile~HEAD
|
test_path_is_file 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 &&
|
||||||
|
|
@ -317,26 +385,31 @@ test_expect_success 'setup content merge + rename/directory conflict w/ disappea
|
||||||
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) &&
|
git ls-files -s >out &&
|
||||||
test 0 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 1 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 0 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
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_path_is_file 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,10 +425,9 @@ 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 &&
|
||||||
|
|
@ -374,26 +446,38 @@ test_expect_success 'setup rename/rename (2to1) + modify/modify' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-rename-2to1 &&
|
||||||
|
|
||||||
git checkout B^0 &&
|
git checkout B^0 &&
|
||||||
|
|
||||||
test_must_fail git merge -s recursive C^0 >out &&
|
test_must_fail git merge -s recursive C^0 >out &&
|
||||||
test_i18ngrep "CONFLICT (rename/rename)" out &&
|
test_i18ngrep "CONFLICT (rename/rename)" out &&
|
||||||
|
|
||||||
test 2 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 2 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
test 2 -eq $(git ls-files -u c | wc -l) &&
|
git ls-files -u >out &&
|
||||||
test 3 -eq $(git ls-files -o | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -u c >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 3 out &&
|
||||||
|
|
||||||
test ! -f a &&
|
test_path_is_missing a &&
|
||||||
test ! -f b &&
|
test_path_is_missing b &&
|
||||||
test -f c~HEAD &&
|
test_path_is_file c~HEAD &&
|
||||||
test -f c~C^0 &&
|
test_path_is_file c~C^0 &&
|
||||||
|
|
||||||
test $(git hash-object c~HEAD) = $(git rev-parse C:a) &&
|
git rev-parse >expect \
|
||||||
test $(git hash-object c~C^0) = $(git rev-parse B:b)
|
C:a B:b &&
|
||||||
|
git hash-object >actual \
|
||||||
|
c~HEAD c~C^0 &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
# Testcase setup for simple rename/rename (1to2) conflict:
|
# Testcase setup for simple rename/rename (1to2) conflict:
|
||||||
|
|
@ -401,10 +485,9 @@ 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 &&
|
||||||
|
|
@ -421,24 +504,34 @@ test_expect_success 'setup simple rename/rename (1to2) conflict' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-rename-1to2 &&
|
||||||
|
|
||||||
git checkout C^0 &&
|
git checkout C^0 &&
|
||||||
|
|
||||||
test_must_fail git merge -s recursive B^0 &&
|
test_must_fail git merge -s recursive B^0 &&
|
||||||
|
|
||||||
test 3 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 3 -eq $(git ls-files -u | wc -l) &&
|
test_line_count = 3 out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
git ls-files -u >out &&
|
||||||
|
test_line_count = 3 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
|
test_path_is_missing a &&
|
||||||
test $(git rev-parse :3:b) = $(git rev-parse A:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :2:c) = $(git rev-parse A:a) &&
|
A:a A:a A:a \
|
||||||
|
A:a A:a &&
|
||||||
test ! -f a &&
|
git rev-parse >actual \
|
||||||
test $(git hash-object b) = $(git rev-parse A:a) &&
|
:1:a :3:b :2:c &&
|
||||||
test $(git hash-object c) = $(git rev-parse A:a)
|
git hash-object >>actual \
|
||||||
|
b c &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
# Testcase setup for rename/rename(1to2)/add-source conflict:
|
# Testcase setup for rename/rename(1to2)/add-source conflict:
|
||||||
|
|
@ -449,10 +542,9 @@ 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 &&
|
||||||
|
|
@ -468,31 +560,38 @@ test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-rename-1to2-add-source-1 &&
|
||||||
|
|
||||||
git checkout B^0 &&
|
git checkout B^0 &&
|
||||||
|
|
||||||
test_must_fail git merge -s recursive C^0 &&
|
test_must_fail git merge -s recursive C^0 &&
|
||||||
|
|
||||||
test 4 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
test_line_count = 4 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse 3:a) = $(git rev-parse C:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse 1:a) = $(git rev-parse A:a) &&
|
C:a A:a B:b C:C &&
|
||||||
test $(git rev-parse 2:b) = $(git rev-parse B:b) &&
|
git rev-parse >actual \
|
||||||
test $(git rev-parse 3:c) = $(git rev-parse C:c) &&
|
:3:a :1:a :2:b :3:c &&
|
||||||
|
test_cmp expect actual
|
||||||
|
|
||||||
test -f a &&
|
test_path_is_file a &&
|
||||||
test -f b &&
|
test_path_is_file b &&
|
||||||
test -f c
|
test_path_is_file 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 &&
|
||||||
|
|
@ -511,24 +610,33 @@ test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-rename-1to2-add-source-2 &&
|
||||||
|
|
||||||
git checkout C^0 &&
|
git checkout C^0 &&
|
||||||
git merge -s recursive B^0 &&
|
git merge -s recursive B^0 &&
|
||||||
|
|
||||||
test 2 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 0 -eq $(git ls-files -o | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 1 out &&
|
||||||
|
|
||||||
test $(git rev-parse HEAD:a) = $(git rev-parse C:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse HEAD:b) = $(git rev-parse A:a)
|
C:a A:a &&
|
||||||
|
git rev-parse >actual \
|
||||||
|
:0:a :0:b &&
|
||||||
|
test_cmp expect actual
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
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 &&
|
||||||
|
|
@ -549,30 +657,40 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
|
||||||
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' '
|
||||||
|
(
|
||||||
|
cd rename-rename-1to2-add-dest &&
|
||||||
|
|
||||||
git checkout C^0 &&
|
git checkout C^0 &&
|
||||||
test_must_fail git merge -s recursive B^0 &&
|
test_must_fail git merge -s recursive B^0 &&
|
||||||
|
|
||||||
test 5 -eq $(git ls-files -s | wc -l) &&
|
git ls-files -s >out &&
|
||||||
test 2 -eq $(git ls-files -u b | wc -l) &&
|
test_line_count = 5 out &&
|
||||||
test 2 -eq $(git ls-files -u c | wc -l) &&
|
git ls-files -u b >out &&
|
||||||
test 4 -eq $(git ls-files -o | wc -l) &&
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -u c >out &&
|
||||||
|
test_line_count = 2 out &&
|
||||||
|
git ls-files -o >out &&
|
||||||
|
test_line_count = 5 out &&
|
||||||
|
|
||||||
test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
|
git rev-parse >expect \
|
||||||
test $(git rev-parse :2:b) = $(git rev-parse C:b) &&
|
A:a C:b B:b C:c B:c &&
|
||||||
test $(git rev-parse :3:b) = $(git rev-parse B:b) &&
|
git rev-parse >actual \
|
||||||
test $(git rev-parse :2:c) = $(git rev-parse C:c) &&
|
:1:a :2:b :3:b :2:c :3:c &&
|
||||||
test $(git rev-parse :3:c) = $(git rev-parse B:c) &&
|
test_cmp expect actual
|
||||||
|
|
||||||
test $(git hash-object c~HEAD) = $(git rev-parse C:c) &&
|
git rev-parse >expect \
|
||||||
test $(git hash-object c~B\^0) = $(git rev-parse B:c) &&
|
C:c B:c C:b B:b &&
|
||||||
test $(git hash-object b~HEAD) = $(git rev-parse C:b) &&
|
git hash-object >actual \
|
||||||
test $(git hash-object b~B\^0) = $(git rev-parse B:b) &&
|
c~HEAD c~B\^0 b~HEAD b~B\^0 &&
|
||||||
|
test_cmp expect actual
|
||||||
|
|
||||||
test ! -f b &&
|
test_path_is_missing b &&
|
||||||
test ! -f c
|
test_path_is_missing c
|
||||||
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue