mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Elijah Newren](/assets/img/avatar_default.png)
merge-recursive.c is built on the idea of running unpack_trees() and then "doing minor touch-ups" to get the result. Unfortunately, unpack_trees() was run in an update-as-it-goes mode, leading merge-recursive.c to follow suit and end up with an immediate evaluation and fix-it-up-as-you-go design. Some things like directory/file conflicts are not well representable in the index data structure, and required special extra code to handle. But then when it was discovered that rename/delete conflicts could also be involved in directory/file conflicts, the special directory/file conflict handling code had to be copied to the rename/delete codepath. ...and then it had to be copied for modify/delete, and for rename/rename(1to2) conflicts, ...and yet it still missed some. Further, when it was discovered that there were also file/submodule conflicts and submodule/directory conflicts, we needed to copy the special submodule handling code to all the special cases throughout the codebase. And then it was discovered that our handling of directory/file conflicts was suboptimal because it would create untracked files to store the contents of the conflicting file, which would not be cleaned up if someone were to run a 'git merge --abort' or 'git rebase --abort'. It was also difficult or scary to try to add or remove the index entries corresponding to these files given the directory/file conflict in the index. But changing merge-recursive.c to handle these correctly was a royal pain because there were so many sites in the code with similar but not identical code for handling directory/file/submodule conflicts that would all need to be updated. I have worked hard to push all directory/file/submodule conflict handling in merge-ort through a single codepath, and avoid creating untracked files for storing tracked content (it does record things at alternate paths, but makes sure they have higher-order stages in the index). Since updating merge-recursive is too much work and we don't want to destabilize it, instead update the testsuite to have different expectations for relevant directory/file/submodule conflict tests. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
161 lines
3.5 KiB
Bash
Executable file
161 lines
3.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Fredrik Kuivinen
|
|
#
|
|
|
|
test_description='Test merge with directory/file conflicts'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'prepare repository' '
|
|
echo Hello >init &&
|
|
git add init &&
|
|
git commit -m initial &&
|
|
|
|
git branch B &&
|
|
mkdir dir &&
|
|
echo foo >dir/foo &&
|
|
git add dir/foo &&
|
|
git commit -m "File: dir/foo" &&
|
|
|
|
git checkout B &&
|
|
echo file dir >dir &&
|
|
git add dir &&
|
|
git commit -m "File: dir"
|
|
'
|
|
|
|
test_expect_success 'Merge with d/f conflicts' '
|
|
test_expect_code 1 git merge -m "merge msg" master
|
|
'
|
|
|
|
test_expect_success 'F/D conflict' '
|
|
git reset --hard &&
|
|
git checkout master &&
|
|
rm .git/index &&
|
|
|
|
mkdir before &&
|
|
echo FILE >before/one &&
|
|
echo FILE >after &&
|
|
git add . &&
|
|
git commit -m first &&
|
|
|
|
rm -f after &&
|
|
git mv before after &&
|
|
git commit -m move &&
|
|
|
|
git checkout -b para HEAD^ &&
|
|
echo COMPLETELY ANOTHER FILE >another &&
|
|
git add . &&
|
|
git commit -m para &&
|
|
|
|
git merge master
|
|
'
|
|
|
|
test_expect_success 'setup modify/delete + directory/file conflict' '
|
|
git checkout --orphan modify &&
|
|
git rm -rf . &&
|
|
git clean -fdqx &&
|
|
|
|
printf "a\nb\nc\nd\ne\nf\ng\nh\n" >letters &&
|
|
git add letters &&
|
|
git commit -m initial &&
|
|
|
|
# Throw in letters.txt for sorting order fun
|
|
# ("letters.txt" sorts between "letters" and "letters/file")
|
|
echo i >>letters &&
|
|
echo "version 2" >letters.txt &&
|
|
git add letters letters.txt &&
|
|
git commit -m modified &&
|
|
|
|
git checkout -b delete HEAD^ &&
|
|
git rm letters &&
|
|
mkdir letters &&
|
|
>letters/file &&
|
|
echo "version 1" >letters.txt &&
|
|
git add letters letters.txt &&
|
|
git commit -m deleted
|
|
'
|
|
|
|
test_expect_success 'modify/delete + directory/file conflict' '
|
|
git checkout delete^0 &&
|
|
test_must_fail git merge modify &&
|
|
|
|
test 5 -eq $(git ls-files -s | wc -l) &&
|
|
test 4 -eq $(git ls-files -u | wc -l) &&
|
|
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
|
|
then
|
|
test 0 -eq $(git ls-files -o | wc -l)
|
|
else
|
|
test 1 -eq $(git ls-files -o | wc -l)
|
|
fi &&
|
|
|
|
test_path_is_file letters/file &&
|
|
test_path_is_file letters.txt &&
|
|
test_path_is_file letters~modify
|
|
'
|
|
|
|
test_expect_success 'modify/delete + directory/file conflict; other way' '
|
|
git reset --hard &&
|
|
git clean -f &&
|
|
git checkout modify^0 &&
|
|
|
|
test_must_fail git merge delete &&
|
|
|
|
test 5 -eq $(git ls-files -s | wc -l) &&
|
|
test 4 -eq $(git ls-files -u | wc -l) &&
|
|
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
|
|
then
|
|
test 0 -eq $(git ls-files -o | wc -l)
|
|
else
|
|
test 1 -eq $(git ls-files -o | wc -l)
|
|
fi &&
|
|
|
|
test_path_is_file letters/file &&
|
|
test_path_is_file letters.txt &&
|
|
test_path_is_file letters~HEAD
|
|
'
|
|
|
|
test_expect_success 'Simple merge in repo with interesting pathnames' '
|
|
# Simple lexicographic ordering of files and directories would be:
|
|
# foo
|
|
# foo/bar
|
|
# foo/bar-2
|
|
# foo/bar/baz
|
|
# foo/bar-2/baz
|
|
# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz
|
|
# can trip up some codepaths, and is the point of this test.
|
|
test_create_repo name-ordering &&
|
|
(
|
|
cd name-ordering &&
|
|
|
|
mkdir -p foo/bar &&
|
|
mkdir -p foo/bar-2 &&
|
|
>foo/bar/baz &&
|
|
>foo/bar-2/baz &&
|
|
git add . &&
|
|
git commit -m initial &&
|
|
|
|
git branch topic &&
|
|
git branch other &&
|
|
|
|
git checkout other &&
|
|
echo other >foo/bar-2/baz &&
|
|
git add -u &&
|
|
git commit -m other &&
|
|
|
|
git checkout topic &&
|
|
echo topic >foo/bar/baz &&
|
|
git add -u &&
|
|
git commit -m topic &&
|
|
|
|
git merge other &&
|
|
git ls-files -s >out &&
|
|
test_line_count = 2 out &&
|
|
git rev-parse :0:foo/bar/baz :0:foo/bar-2/baz >actual &&
|
|
git rev-parse HEAD~1:foo/bar/baz other:foo/bar-2/baz >expect &&
|
|
test_cmp expect actual
|
|
)
|
|
|
|
'
|
|
|
|
test_done
|