2005-12-03 10:41:20 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Fredrik Kuivinen
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Test merge with directory/file conflicts'
|
2020-11-18 23:44:38 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2005-12-03 10:41:20 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2010-09-20 08:28:42 +00:00
|
|
|
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"
|
|
|
|
'
|
2005-12-03 10:41:20 +00:00
|
|
|
|
2010-10-03 19:59:59 +00:00
|
|
|
test_expect_success 'Merge with d/f conflicts' '
|
2020-11-18 23:44:38 +00:00
|
|
|
test_expect_code 1 git merge -m "merge msg" main
|
2010-10-03 19:59:59 +00:00
|
|
|
'
|
2005-12-03 10:41:20 +00:00
|
|
|
|
2010-07-09 13:10:54 +00:00
|
|
|
test_expect_success 'F/D conflict' '
|
2009-05-11 09:31:42 +00:00
|
|
|
git reset --hard &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git checkout main &&
|
2009-05-11 09:31:42 +00:00
|
|
|
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 &&
|
|
|
|
|
2020-11-18 23:44:38 +00:00
|
|
|
git merge main
|
2009-05-11 09:31:42 +00:00
|
|
|
'
|
|
|
|
|
2010-09-20 08:28:43 +00:00
|
|
|
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 &&
|
|
|
|
|
2011-08-12 05:19:56 +00:00
|
|
|
# Throw in letters.txt for sorting order fun
|
|
|
|
# ("letters.txt" sorts between "letters" and "letters/file")
|
2010-09-20 08:28:43 +00:00
|
|
|
echo i >>letters &&
|
2011-08-12 05:19:56 +00:00
|
|
|
echo "version 2" >letters.txt &&
|
|
|
|
git add letters letters.txt &&
|
2010-09-20 08:28:43 +00:00
|
|
|
git commit -m modified &&
|
|
|
|
|
|
|
|
git checkout -b delete HEAD^ &&
|
|
|
|
git rm letters &&
|
|
|
|
mkdir letters &&
|
|
|
|
>letters/file &&
|
2011-08-12 05:19:56 +00:00
|
|
|
echo "version 1" >letters.txt &&
|
|
|
|
git add letters letters.txt &&
|
2010-09-20 08:28:43 +00:00
|
|
|
git commit -m deleted
|
|
|
|
'
|
|
|
|
|
2010-09-20 08:29:08 +00:00
|
|
|
test_expect_success 'modify/delete + directory/file conflict' '
|
2010-09-20 08:28:43 +00:00
|
|
|
git checkout delete^0 &&
|
|
|
|
test_must_fail git merge modify &&
|
|
|
|
|
2021-07-04 05:46:11 +00:00
|
|
|
test_stdout_line_count = 5 git ls-files -s &&
|
|
|
|
test_stdout_line_count = 4 git ls-files -u &&
|
merge tests: expect improved directory/file conflict handling in ort
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>
2020-10-26 17:01:37 +00:00
|
|
|
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
|
|
|
|
then
|
2021-07-04 05:46:11 +00:00
|
|
|
test_stdout_line_count = 0 git ls-files -o
|
merge tests: expect improved directory/file conflict handling in ort
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>
2020-10-26 17:01:37 +00:00
|
|
|
else
|
2021-07-04 05:46:11 +00:00
|
|
|
test_stdout_line_count = 1 git ls-files -o
|
merge tests: expect improved directory/file conflict handling in ort
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>
2020-10-26 17:01:37 +00:00
|
|
|
fi &&
|
2010-09-20 08:28:43 +00:00
|
|
|
|
2020-02-27 00:14:21 +00:00
|
|
|
test_path_is_file letters/file &&
|
|
|
|
test_path_is_file letters.txt &&
|
|
|
|
test_path_is_file letters~modify
|
2010-09-20 08:28:43 +00:00
|
|
|
'
|
|
|
|
|
2010-09-20 08:29:09 +00:00
|
|
|
test_expect_success 'modify/delete + directory/file conflict; other way' '
|
2010-09-20 08:28:43 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git clean -f &&
|
|
|
|
git checkout modify^0 &&
|
2011-08-12 05:19:56 +00:00
|
|
|
|
2010-09-20 08:28:43 +00:00
|
|
|
test_must_fail git merge delete &&
|
|
|
|
|
2021-07-04 05:46:11 +00:00
|
|
|
test_stdout_line_count = 5 git ls-files -s &&
|
|
|
|
test_stdout_line_count = 4 git ls-files -u &&
|
merge tests: expect improved directory/file conflict handling in ort
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>
2020-10-26 17:01:37 +00:00
|
|
|
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
|
|
|
|
then
|
2021-07-04 05:46:11 +00:00
|
|
|
test_stdout_line_count = 0 git ls-files -o
|
merge tests: expect improved directory/file conflict handling in ort
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>
2020-10-26 17:01:37 +00:00
|
|
|
else
|
2021-07-04 05:46:11 +00:00
|
|
|
test_stdout_line_count = 1 git ls-files -o
|
merge tests: expect improved directory/file conflict handling in ort
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>
2020-10-26 17:01:37 +00:00
|
|
|
fi &&
|
2010-09-20 08:28:43 +00:00
|
|
|
|
2020-02-27 00:14:21 +00:00
|
|
|
test_path_is_file letters/file &&
|
|
|
|
test_path_is_file letters.txt &&
|
|
|
|
test_path_is_file letters~HEAD
|
2010-09-20 08:28:43 +00:00
|
|
|
'
|
|
|
|
|
2020-02-27 00:14:24 +00:00
|
|
|
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.
|
2022-08-26 03:49:19 +00:00
|
|
|
git init name-ordering &&
|
2020-02-27 00:14:24 +00:00
|
|
|
(
|
|
|
|
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 &&
|
|
|
|
|
2020-10-08 10:13:47 +00:00
|
|
|
git branch topic &&
|
2020-02-27 00:14:24 +00:00
|
|
|
git branch other &&
|
|
|
|
|
|
|
|
git checkout other &&
|
|
|
|
echo other >foo/bar-2/baz &&
|
|
|
|
git add -u &&
|
|
|
|
git commit -m other &&
|
|
|
|
|
2020-10-08 10:13:47 +00:00
|
|
|
git checkout topic &&
|
|
|
|
echo topic >foo/bar/baz &&
|
2020-02-27 00:14:24 +00:00
|
|
|
git add -u &&
|
2020-10-08 10:13:47 +00:00
|
|
|
git commit -m topic &&
|
2020-02-27 00:14:24 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2005-12-03 10:41:20 +00:00
|
|
|
test_done
|