зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Elijah Newren
Junio C Hamano
Родитель
e144d126d7
Коммит
2a4c19efbf
|
|
@ -21,6 +21,10 @@ get_clean_checkout () {
|
|||
#
|
||||
|
||||
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" &&
|
||||
for i in $ten
|
||||
do
|
||||
|
|
@ -49,9 +53,13 @@ test_expect_success 'setup basic criss-cross + rename with no modifications' '
|
|||
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' '
|
||||
(
|
||||
cd basic-rename &&
|
||||
|
||||
git reset --hard &&
|
||||
git checkout L2^0 &&
|
||||
|
||||
|
|
@ -66,6 +74,7 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
|
|||
|
||||
test $(git rev-parse L2:three) = $(git hash-object three~HEAD) &&
|
||||
test $(git rev-parse R2:three) = $(git hash-object three~R2^0)
|
||||
)
|
||||
'
|
||||
|
||||
#
|
||||
|
|
@ -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' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-modify &&
|
||||
(
|
||||
cd rename-modify &&
|
||||
|
||||
ten="0 1 2 3 4 5 6 7 8 9" &&
|
||||
for i in $ten
|
||||
|
|
@ -116,10 +124,13 @@ test_expect_success 'setup criss-cross + rename merges with basic modification'
|
|||
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 &&
|
||||
(
|
||||
cd rename-modify &&
|
||||
|
||||
git checkout L2^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive R2^0 &&
|
||||
|
|
@ -133,6 +144,7 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'
|
|||
|
||||
test $(git rev-parse L2:three) = $(git hash-object three~HEAD) &&
|
||||
test $(git rev-parse R2:three) = $(git hash-object three~R2^0)
|
||||
)
|
||||
'
|
||||
|
||||
#
|
||||
|
|
@ -156,10 +168,9 @@ 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 &&
|
||||
test_create_repo rename-add &&
|
||||
(
|
||||
cd rename-add &&
|
||||
|
||||
printf "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n" >a &&
|
||||
git add a &&
|
||||
|
|
@ -189,10 +200,13 @@ test_expect_success 'setup differently handled merges of rename/add conflict' '
|
|||
git add -u &&
|
||||
test_tick && git commit -m E &&
|
||||
git tag E
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'git detects differently handled merges conflict' '
|
||||
git reset --hard &&
|
||||
(
|
||||
cd rename-add &&
|
||||
|
||||
git checkout D^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive E^0 &&
|
||||
|
|
@ -214,6 +228,7 @@ test_expect_success 'git detects differently handled merges conflict' '
|
|||
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,10 +251,9 @@ 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 &&
|
||||
test_create_repo modify-delete &&
|
||||
(
|
||||
cd modify-delete &&
|
||||
|
||||
echo A >file &&
|
||||
git add file &&
|
||||
|
|
@ -272,9 +286,13 @@ test_expect_success 'setup criss-cross + modify/delete resolved differently' '
|
|||
test_tick &&
|
||||
git commit -m E &&
|
||||
git tag E
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
|
||||
(
|
||||
cd modify-delete &&
|
||||
|
||||
git checkout D^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive E^0 &&
|
||||
|
|
@ -284,9 +302,13 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
|
|||
|
||||
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' '
|
||||
(
|
||||
cd modify-delete &&
|
||||
|
||||
git reset --hard &&
|
||||
git checkout E^0 &&
|
||||
|
||||
|
|
@ -297,6 +319,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
|
|||
|
||||
test $(git rev-parse :1:file) = $(git rev-parse master:file) &&
|
||||
test $(git rev-parse :3:file) = $(git rev-parse B:file)
|
||||
)
|
||||
'
|
||||
|
||||
#
|
||||
|
|
@ -336,10 +359,9 @@ 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 &&
|
||||
test_create_repo directory-file &&
|
||||
(
|
||||
cd directory-file &&
|
||||
|
||||
>ignore-me &&
|
||||
git add ignore-me &&
|
||||
|
|
@ -390,9 +412,13 @@ test_expect_success 'setup differently handled merges of directory/file conflict
|
|||
test_tick &&
|
||||
git commit -m E2 &&
|
||||
git tag E2
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'merge of D & E1 fails but has appropriate contents' '
|
||||
(
|
||||
cd directory-file &&
|
||||
|
||||
get_clean_checkout D^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive E1^0 &&
|
||||
|
|
@ -403,9 +429,13 @@ test_expect_success 'merge of D & E1 fails but has appropriate contents' '
|
|||
|
||||
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' '
|
||||
(
|
||||
cd directory-file &&
|
||||
|
||||
get_clean_checkout E1^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive D^0 &&
|
||||
|
|
@ -416,9 +446,13 @@ test_expect_success 'merge of E1 & D fails but has appropriate contents' '
|
|||
|
||||
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' '
|
||||
(
|
||||
cd directory-file &&
|
||||
|
||||
get_clean_checkout D^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive E2^0 &&
|
||||
|
|
@ -433,9 +467,13 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' '
|
|||
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' '
|
||||
(
|
||||
cd directory-file &&
|
||||
|
||||
get_clean_checkout E2^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive D^0 &&
|
||||
|
|
@ -450,6 +488,7 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' '
|
|||
test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) &&
|
||||
|
||||
test -f a~D^0
|
||||
)
|
||||
'
|
||||
|
||||
#
|
||||
|
|
@ -492,11 +531,9 @@ 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 &&
|
||||
test_create_repo rename-squared-squared &&
|
||||
(
|
||||
cd rename-squared-squared &&
|
||||
|
||||
printf "1\n2\n3\n4\n5\n6\n" >a &&
|
||||
git add a &&
|
||||
|
|
@ -526,9 +563,13 @@ test_expect_success 'setup rename/rename(1to2)/modify followed by what looks lik
|
|||
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' '
|
||||
(
|
||||
cd rename-squared-squared &&
|
||||
|
||||
git checkout D^0 &&
|
||||
|
||||
git merge -s recursive E^0 &&
|
||||
|
|
@ -538,6 +579,7 @@ test_expect_success 'handle rename/rename(1to2)/modify followed by what looks li
|
|||
test 0 -eq $(git ls-files -o | wc -l) &&
|
||||
|
||||
test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
|
||||
)
|
||||
'
|
||||
|
||||
#
|
||||
|
|
@ -562,11 +604,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
|
||||
# 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 &&
|
||||
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 &&
|
||||
|
|
@ -601,9 +642,13 @@ test_expect_success 'setup criss-cross + rename/rename/add + modify/modify' '
|
|||
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' '
|
||||
(
|
||||
cd rename-rename-add-source &&
|
||||
|
||||
git checkout D^0 &&
|
||||
|
||||
git merge -s recursive E^0 &&
|
||||
|
|
@ -615,6 +660,7 @@ test_expect_failure 'detect rename/rename/add-source for virtual merge-base' '
|
|||
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,10 +684,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...
|
||||
|
||||
test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-rename-add-dest &&
|
||||
(
|
||||
cd rename-rename-add-dest &&
|
||||
|
||||
>a &&
|
||||
git add a &&
|
||||
|
|
@ -671,9 +716,13 @@ test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' '
|
|||
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' '
|
||||
(
|
||||
cd rename-rename-add-dest &&
|
||||
|
||||
git checkout D^0 &&
|
||||
|
||||
git merge -s recursive E^0 &&
|
||||
|
|
@ -684,6 +733,7 @@ test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' '
|
|||
|
||||
test $(git rev-parse HEAD:a) = $(git rev-parse A:a) &&
|
||||
test $(git rev-parse HEAD:c) = $(git rev-parse E:c)
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
|
|
@ -6,6 +6,10 @@ test_description="recursive merge corner cases w/ renames but not criss-crosses"
|
|||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'setup rename/delete + untracked file' '
|
||||
test_create_repo rename-delete-untracked &&
|
||||
(
|
||||
cd rename-delete-untracked &&
|
||||
|
||||
echo "A pretty inscription" >ring &&
|
||||
git add ring &&
|
||||
test_tick &&
|
||||
|
|
@ -24,13 +28,18 @@ test_expect_success 'setup rename/delete + untracked file' '
|
|||
test_tick &&
|
||||
git commit -m track-people-instead-of-objects &&
|
||||
echo "Myyy PRECIOUSSS" >ring
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success "Does git preserve Gollum's precious artifact?" '
|
||||
(
|
||||
cd rename-delete-untracked &&
|
||||
|
||||
test_must_fail git merge -s recursive rename-the-ring &&
|
||||
|
||||
# Make sure git did not delete an untracked file
|
||||
test -f ring
|
||||
)
|
||||
'
|
||||
|
||||
# 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
|
||||
|
||||
test_expect_success 'setup rename/modify/add-source conflict' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-modify-add-source &&
|
||||
(
|
||||
cd rename-modify-add-source &&
|
||||
|
||||
printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
|
||||
git add a &&
|
||||
|
|
@ -61,22 +69,26 @@ test_expect_success 'setup rename/modify/add-source conflict' '
|
|||
echo something completely different >a &&
|
||||
git add a &&
|
||||
git commit -m C
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure 'rename/modify/add-source conflict resolvable' '
|
||||
(
|
||||
cd rename-modify-add-source &&
|
||||
|
||||
git checkout B^0 &&
|
||||
|
||||
git merge -s recursive C^0 &&
|
||||
|
||||
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' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo break-detection-1 &&
|
||||
(
|
||||
cd break-detection-1 &&
|
||||
|
||||
printf "1\n2\n3\n4\n5\n" >a &&
|
||||
echo foo >b &&
|
||||
|
|
@ -94,9 +106,13 @@ test_expect_success 'setup resolvable conflict missed if rename missed' '
|
|||
echo 6 >>a &&
|
||||
git add a &&
|
||||
git commit -m C
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure 'conflict caused if rename not detected' '
|
||||
(
|
||||
cd break-detection-1 &&
|
||||
|
||||
git checkout -q C^0 &&
|
||||
git merge -s recursive B^0 &&
|
||||
|
||||
|
|
@ -107,11 +123,19 @@ test_expect_failure 'conflict caused if rename not detected' '
|
|||
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' '
|
||||
git reset --hard &&
|
||||
git clean -f &&
|
||||
test_create_repo break-detection-2 &&
|
||||
(
|
||||
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 &&
|
||||
echo 7 >>a &&
|
||||
|
|
@ -126,11 +150,16 @@ test_expect_success 'setup conflict resolved wrong if rename missed' '
|
|||
echo "Completely different content" >>a &&
|
||||
git add a &&
|
||||
git commit -m E
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure 'missed conflict if rename not detected' '
|
||||
(
|
||||
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
|
||||
|
|
@ -145,10 +174,9 @@ test_expect_failure 'missed conflict if rename not detected' '
|
|||
# Commit C: rename a->b, add unrelated a
|
||||
|
||||
test_expect_success 'setup undetected rename/add-source causes data loss' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo break-detection-3 &&
|
||||
(
|
||||
cd break-detection-3 &&
|
||||
|
||||
printf "1\n2\n3\n4\n5\n" >a &&
|
||||
git add a &&
|
||||
|
|
@ -164,9 +192,13 @@ test_expect_success 'setup undetected rename/add-source causes data loss' '
|
|||
echo foobar >a &&
|
||||
git add a &&
|
||||
git commit -m C
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure 'detect rename/add-source and preserve all data' '
|
||||
(
|
||||
cd break-detection-3 &&
|
||||
|
||||
git checkout B^0 &&
|
||||
|
||||
git merge -s recursive C^0 &&
|
||||
|
|
@ -180,9 +212,13 @@ test_expect_failure 'detect rename/add-source and preserve all data' '
|
|||
|
||||
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' '
|
||||
(
|
||||
cd break-detection-3 &&
|
||||
|
||||
git checkout C^0 &&
|
||||
|
||||
git merge -s recursive B^0 &&
|
||||
|
|
@ -196,13 +232,13 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other
|
|||
|
||||
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' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-directory-1 &&
|
||||
(
|
||||
cd rename-directory-1 &&
|
||||
|
||||
printf "1\n2\n3\n4\n5\n6\n" >file &&
|
||||
git add file &&
|
||||
|
|
@ -232,12 +268,12 @@ test_expect_success 'setup content merge + rename/directory conflict' '
|
|||
git rm file &&
|
||||
test_tick &&
|
||||
git commit -m left
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'rename/directory conflict + clean content merge' '
|
||||
git reset --hard &&
|
||||
git reset --hard &&
|
||||
git clean -fdqx &&
|
||||
(
|
||||
cd rename-directory-1 &&
|
||||
|
||||
git checkout left-clean^0 &&
|
||||
|
||||
|
|
@ -256,9 +292,13 @@ test_expect_success 'rename/directory conflict + clean content merge' '
|
|||
|
||||
test -f newfile/realfile &&
|
||||
test -f newfile~HEAD
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'rename/directory conflict + content merge conflict' '
|
||||
(
|
||||
cd rename-directory-1 &&
|
||||
|
||||
git reset --hard &&
|
||||
git reset --hard &&
|
||||
git clean -fdqx &&
|
||||
|
|
@ -287,14 +327,13 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
|
|||
|
||||
test -f newfile/realfile &&
|
||||
test -f newfile~HEAD
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' '
|
||||
git reset --hard &&
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-directory-2 &&
|
||||
(
|
||||
cd rename-directory-2 &&
|
||||
|
||||
mkdir sub &&
|
||||
printf "1\n2\n3\n4\n5\n6\n" >sub/file &&
|
||||
|
|
@ -317,11 +356,12 @@ test_expect_success 'setup content merge + rename/directory conflict w/ disappea
|
|||
git add sub &&
|
||||
test_tick &&
|
||||
git commit -m left
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'disappearing dir in rename/directory conflict handled' '
|
||||
git reset --hard &&
|
||||
git clean -fdqx &&
|
||||
(
|
||||
cd rename-directory-2 &&
|
||||
|
||||
git checkout left^0 &&
|
||||
|
||||
|
|
@ -337,6 +377,7 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '
|
|||
test_cmp expect sub &&
|
||||
|
||||
test -f sub
|
||||
)
|
||||
'
|
||||
|
||||
# Test for all kinds of things that can go wrong with rename/rename (2to1):
|
||||
|
|
@ -352,10 +393,9 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '
|
|||
# * Nothing else should be present. Is anything?
|
||||
|
||||
test_expect_success 'setup rename/rename (2to1) + modify/modify' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-rename-2to1 &&
|
||||
(
|
||||
cd rename-rename-2to1 &&
|
||||
|
||||
printf "1\n2\n3\n4\n5\n" >a &&
|
||||
printf "5\n4\n3\n2\n1\n" >b &&
|
||||
|
|
@ -374,9 +414,13 @@ test_expect_success 'setup rename/rename (2to1) + modify/modify' '
|
|||
echo 6 >>a &&
|
||||
git add a &&
|
||||
git commit -m C
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'handle rename/rename (2to1) conflict correctly' '
|
||||
(
|
||||
cd rename-rename-2to1 &&
|
||||
|
||||
git checkout B^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive C^0 >out &&
|
||||
|
|
@ -394,6 +438,7 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
|
|||
|
||||
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:
|
||||
|
|
@ -401,10 +446,9 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
|
|||
# Commit B: rename a->b
|
||||
# Commit C: rename a->c
|
||||
test_expect_success 'setup simple rename/rename (1to2) conflict' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-rename-1to2 &&
|
||||
(
|
||||
cd rename-rename-1to2 &&
|
||||
|
||||
echo stuff >a &&
|
||||
git add a &&
|
||||
|
|
@ -421,9 +465,13 @@ test_expect_success 'setup simple rename/rename (1to2) conflict' '
|
|||
git mv a c &&
|
||||
test_tick &&
|
||||
git commit -m C
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'merge has correct working tree contents' '
|
||||
(
|
||||
cd rename-rename-1to2 &&
|
||||
|
||||
git checkout C^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive B^0 &&
|
||||
|
|
@ -439,6 +487,7 @@ test_expect_success 'merge has correct working tree contents' '
|
|||
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:
|
||||
|
|
@ -449,10 +498,9 @@ test_expect_success 'merge has correct working tree contents' '
|
|||
# Merging of B & C should NOT be clean; there's a rename/rename conflict
|
||||
|
||||
test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-rename-1to2-add-source-1 &&
|
||||
(
|
||||
cd rename-rename-1to2-add-source-1 &&
|
||||
|
||||
printf "1\n2\n3\n4\n5\n6\n7\n" >a &&
|
||||
git add a &&
|
||||
|
|
@ -468,9 +516,13 @@ test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
|
|||
echo something completely different >a &&
|
||||
git add a &&
|
||||
git commit -m C
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' '
|
||||
(
|
||||
cd rename-rename-1to2-add-source-1 &&
|
||||
|
||||
git checkout B^0 &&
|
||||
|
||||
test_must_fail git merge -s recursive C^0 &&
|
||||
|
|
@ -486,13 +538,13 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'
|
|||
test -f a &&
|
||||
test -f b &&
|
||||
test -f c
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-rename-1to2-add-source-2 &&
|
||||
(
|
||||
cd rename-rename-1to2-add-source-2 &&
|
||||
|
||||
>a &&
|
||||
git add a &&
|
||||
|
|
@ -511,9 +563,13 @@ test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
|
|||
git add a &&
|
||||
test_tick &&
|
||||
git commit -m two
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_failure 'rename/rename/add-source still tracks new a file' '
|
||||
(
|
||||
cd rename-rename-1to2-add-source-2 &&
|
||||
|
||||
git checkout C^0 &&
|
||||
git merge -s recursive B^0 &&
|
||||
|
||||
|
|
@ -522,13 +578,13 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' '
|
|||
|
||||
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' '
|
||||
git rm -rf . &&
|
||||
git clean -fdqx &&
|
||||
rm -rf .git &&
|
||||
git init &&
|
||||
test_create_repo rename-rename-1to2-add-dest &&
|
||||
(
|
||||
cd rename-rename-1to2-add-dest &&
|
||||
|
||||
echo stuff >a &&
|
||||
git add a &&
|
||||
|
|
@ -549,9 +605,13 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
|
|||
git add b &&
|
||||
test_tick &&
|
||||
git commit -m two
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
|
||||
(
|
||||
cd rename-rename-1to2-add-dest &&
|
||||
|
||||
git checkout C^0 &&
|
||||
test_must_fail git merge -s recursive B^0 &&
|
||||
|
||||
|
|
@ -573,6 +633,7 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
|
|||
|
||||
test ! -f b &&
|
||||
test ! -f c
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче