mirror of
https://github.com/git/git.git
synced 2024-11-05 16:52:59 +01:00
86273e5764
In merge-recursive.c, whenever there was a rename where a file name on one side of the rename matches a directory name on the other side of the merge, then the very first check that string_list_has_string(&o->current_directory_set, ren1_dst) would trigger forcing it into marking it as a rename/directory conflict. However, if the path is only renamed on one side and a simple three-way merge between the separate files resolves cleanly, then we don't need to mark it as a rename/directory conflict. So, we can simply move the check for rename/directory conflicts after we've verified that there isn't a rename/rename conflict and that a threeway content merge doesn't work. This changes the particular error message one gets in the case where the directory name that a file on one side of the rename matches is not also part of the rename pair. For example, with commits containing the files: COMMON -> (HEAD, MERGE ) --------- --------------- ------- sub/file1 -> (sub/file1, newsub) <NULL> -> (newsub/newfile, <NULL>) then previously when one tried to merge MERGE into HEAD, one would get CONFLICT (rename/directory): Rename sub/file1->newsub in HEAD directory newsub added in merge Renaming sub/file1 to newsub~HEAD instead Adding newsub/newfile Automatic merge failed; fix conflicts and then commit the result. After this patch, the error message will instead become: Removing newsub Adding newsub/newfile CONFLICT (file/directory): There is a directory with name newsub in merge. Adding newsub as newsub~HEAD Automatic merge failed; fix conflicts and then commit the result. That makes more sense to me, because git can't know that there's a conflict until after it's tried resolving paths involving newsub/newfile to see if they are still in the way at the end (and if newsub/newfile is not in the way at the end, there should be no conflict at all, which did not hold with git previously). Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
101 lines
2.3 KiB
Bash
Executable file
101 lines
2.3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test cherry-pick with directory/file conflicts'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
|
|
mkdir a &&
|
|
>a/f &&
|
|
git add a &&
|
|
git commit -m a &&
|
|
|
|
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
|