mirror of
https://github.com/git/git.git
synced 2024-11-15 13:43:45 +01:00
899663f8e4
The first test did not run on msysGit due to the SYMLINKS constraint and so subsequent tests failed because the test repository was not initialized. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
103 lines
2.4 KiB
Bash
Executable file
103 lines
2.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test cherry-pick with directory/file conflicts'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'Initialize repository' '
|
|
mkdir a &&
|
|
>a/f &&
|
|
git add a &&
|
|
git commit -m a
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
|
|
mkdir b &&
|
|
ln -s ../a b/a &&
|
|
git add b &&
|
|
git commit -m b &&
|
|
|
|
git checkout -b branch &&
|
|
rm b/a &&
|
|
mv a b/a &&
|
|
ln -s b/a a &&
|
|
git add . &&
|
|
git commit -m swap &&
|
|
|
|
>f1 &&
|
|
git add f1 &&
|
|
git commit -m f1
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' '
|
|
git reset --hard &&
|
|
git checkout master^0 &&
|
|
git cherry-pick branch
|
|
'
|
|
|
|
test_expect_success 'Setup rename with file on one side matching directory name on other' '
|
|
git checkout --orphan nick-testcase &&
|
|
git rm -rf . &&
|
|
|
|
>empty &&
|
|
git add empty &&
|
|
git commit -m "Empty file" &&
|
|
|
|
git checkout -b simple &&
|
|
mv empty file &&
|
|
mkdir empty &&
|
|
mv file empty &&
|
|
git add empty/file &&
|
|
git commit -m "Empty file under empty dir" &&
|
|
|
|
echo content >newfile &&
|
|
git add newfile &&
|
|
git commit -m "New file"
|
|
'
|
|
|
|
test_expect_success 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)' '
|
|
git reset --hard &&
|
|
git checkout -q nick-testcase^0 &&
|
|
git cherry-pick --strategy=resolve simple
|
|
'
|
|
|
|
test_expect_success 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)' '
|
|
git reset --hard &&
|
|
git checkout -q nick-testcase^0 &&
|
|
git cherry-pick --strategy=recursive simple
|
|
'
|
|
|
|
test_expect_success 'Setup rename with file on one side matching different dirname on other' '
|
|
git reset --hard &&
|
|
git checkout --orphan mergeme &&
|
|
git rm -rf . &&
|
|
|
|
mkdir sub &&
|
|
mkdir othersub &&
|
|
echo content > sub/file &&
|
|
echo foo > othersub/whatever &&
|
|
git add -A &&
|
|
git commit -m "Common commmit" &&
|
|
|
|
git rm -rf othersub &&
|
|
git mv sub/file othersub &&
|
|
git commit -m "Commit to merge" &&
|
|
|
|
git checkout -b newhead mergeme~1 &&
|
|
>independent-change &&
|
|
git add independent-change &&
|
|
git commit -m "Completely unrelated change"
|
|
'
|
|
|
|
test_expect_success 'Cherry-pick with rename to different D/F conflict succeeds (resolve)' '
|
|
git reset --hard &&
|
|
git checkout -q newhead^0 &&
|
|
git cherry-pick --strategy=resolve mergeme
|
|
'
|
|
|
|
test_expect_success 'Cherry-pick with rename to different D/F conflict succeeds (recursive)' '
|
|
git reset --hard &&
|
|
git checkout -q newhead^0 &&
|
|
git cherry-pick --strategy=recursive mergeme
|
|
'
|
|
|
|
test_done
|