2008-02-23 19:08:25 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='subtree merge strategy'
|
|
|
|
|
|
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
|
|
|
|
|
|
2008-02-23 19:08:25 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
|
2010-10-31 01:46:54 +00:00
|
|
|
s="1 2 3 4 5 6 7 8" &&
|
2021-12-09 05:11:05 +00:00
|
|
|
test_write_lines $s >hello &&
|
2008-02-23 19:08:25 +00:00
|
|
|
git add hello &&
|
|
|
|
|
git commit -m initial &&
|
|
|
|
|
git checkout -b side &&
|
|
|
|
|
echo >>hello world &&
|
|
|
|
|
git add hello &&
|
|
|
|
|
git commit -m second &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git checkout main &&
|
2021-12-09 05:11:05 +00:00
|
|
|
test_write_lines mundo $s >hello &&
|
2008-02-23 19:08:25 +00:00
|
|
|
git add hello &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git commit -m main
|
2008-02-23 19:08:25 +00:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'subtree available and works like recursive' '
|
|
|
|
|
|
|
|
|
|
git merge -s subtree side &&
|
2021-12-09 05:11:05 +00:00
|
|
|
test_write_lines mundo $s world >expect &&
|
2008-03-12 21:36:36 +00:00
|
|
|
test_cmp expect hello
|
2008-02-23 19:08:25 +00:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
score_trees(): fix iteration over trees with missing entries
In score_trees(), we walk over two sorted trees to find
which entries are missing or have different content between
the two. So if we have two trees with these entries:
one two
--- ---
a a
b c
c d
we'd expect the loop to:
- compare "a" to "a"
- compare "b" to "c"; because these are sorted lists, we
know that the second tree does not have "b"
- compare "c" to "c"
- compare "d" to end-of-list; we know that the first tree
does not have "d"
And prior to d8febde370 (match-trees: simplify score_trees()
using tree_entry(), 2013-03-24) that worked. But after that
commit, we mistakenly increment the tree pointers for every
loop iteration, even when we've processed the entry for only
one side. As a result, we end up doing this:
- compare "a" to "a"
- compare "b" to "c"; we know that we do not have "b", but
we still increment both tree pointers; at this point
we're out of sync and all further comparisons are wrong
- compare "c" to "d" and mistakenly claim that the second
tree does not have "c"
- exit the loop, mistakenly not realizing that the first
tree does not have "d"
So contrary to the claim in d8febde370, we really do need to
manually use update_tree_entry(), because advancing the tree
pointer depends on the entry comparison.
That means we must stop using tree_entry() to access each
entry, since it auto-advances the pointer. Instead:
- we'll use tree_desc.size directly to know if there's
anything left to look at (which is what tree_entry() was
doing under the hood)
- rather than do an extra struct assignment to "e1" and
"e2", we can just access the "entry" field of tree_desc
directly
That makes us a little more intimate with the tree_desc
code, but that's not uncommon for its callers.
The included test shows off the bug by adding a new entry
"bar.t", which sorts early in the tree and de-syncs the
comparison for "foo.t", which comes after.
Reported-by: George Shammas <georgyo@gmail.com>
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-02 18:58:21 +00:00
|
|
|
test_expect_success 'setup branch sub' '
|
|
|
|
|
git checkout --orphan sub &&
|
|
|
|
|
git rm -rf . &&
|
|
|
|
|
test_commit foo
|
|
|
|
|
'
|
|
|
|
|
|
2020-10-08 10:13:47 +00:00
|
|
|
test_expect_success 'setup topic branch' '
|
2020-11-18 23:44:38 +00:00
|
|
|
git checkout -b topic main &&
|
score_trees(): fix iteration over trees with missing entries
In score_trees(), we walk over two sorted trees to find
which entries are missing or have different content between
the two. So if we have two trees with these entries:
one two
--- ---
a a
b c
c d
we'd expect the loop to:
- compare "a" to "a"
- compare "b" to "c"; because these are sorted lists, we
know that the second tree does not have "b"
- compare "c" to "c"
- compare "d" to end-of-list; we know that the first tree
does not have "d"
And prior to d8febde370 (match-trees: simplify score_trees()
using tree_entry(), 2013-03-24) that worked. But after that
commit, we mistakenly increment the tree pointers for every
loop iteration, even when we've processed the entry for only
one side. As a result, we end up doing this:
- compare "a" to "a"
- compare "b" to "c"; we know that we do not have "b", but
we still increment both tree pointers; at this point
we're out of sync and all further comparisons are wrong
- compare "c" to "d" and mistakenly claim that the second
tree does not have "c"
- exit the loop, mistakenly not realizing that the first
tree does not have "d"
So contrary to the claim in d8febde370, we really do need to
manually use update_tree_entry(), because advancing the tree
pointer depends on the entry comparison.
That means we must stop using tree_entry() to access each
entry, since it auto-advances the pointer. Instead:
- we'll use tree_desc.size directly to know if there's
anything left to look at (which is what tree_entry() was
doing under the hood)
- rather than do an extra struct assignment to "e1" and
"e2", we can just access the "entry" field of tree_desc
directly
That makes us a little more intimate with the tree_desc
code, but that's not uncommon for its callers.
The included test shows off the bug by adding a new entry
"bar.t", which sorts early in the tree and de-syncs the
comparison for "foo.t", which comes after.
Reported-by: George Shammas <georgyo@gmail.com>
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-02 18:58:21 +00:00
|
|
|
git merge -s ours --no-commit --allow-unrelated-histories sub &&
|
|
|
|
|
git read-tree --prefix=dir/ -u sub &&
|
2020-10-08 10:13:47 +00:00
|
|
|
git commit -m "initial merge of sub into topic" &&
|
score_trees(): fix iteration over trees with missing entries
In score_trees(), we walk over two sorted trees to find
which entries are missing or have different content between
the two. So if we have two trees with these entries:
one two
--- ---
a a
b c
c d
we'd expect the loop to:
- compare "a" to "a"
- compare "b" to "c"; because these are sorted lists, we
know that the second tree does not have "b"
- compare "c" to "c"
- compare "d" to end-of-list; we know that the first tree
does not have "d"
And prior to d8febde370 (match-trees: simplify score_trees()
using tree_entry(), 2013-03-24) that worked. But after that
commit, we mistakenly increment the tree pointers for every
loop iteration, even when we've processed the entry for only
one side. As a result, we end up doing this:
- compare "a" to "a"
- compare "b" to "c"; we know that we do not have "b", but
we still increment both tree pointers; at this point
we're out of sync and all further comparisons are wrong
- compare "c" to "d" and mistakenly claim that the second
tree does not have "c"
- exit the loop, mistakenly not realizing that the first
tree does not have "d"
So contrary to the claim in d8febde370, we really do need to
manually use update_tree_entry(), because advancing the tree
pointer depends on the entry comparison.
That means we must stop using tree_entry() to access each
entry, since it auto-advances the pointer. Instead:
- we'll use tree_desc.size directly to know if there's
anything left to look at (which is what tree_entry() was
doing under the hood)
- rather than do an extra struct assignment to "e1" and
"e2", we can just access the "entry" field of tree_desc
directly
That makes us a little more intimate with the tree_desc
code, but that's not uncommon for its callers.
The included test shows off the bug by adding a new entry
"bar.t", which sorts early in the tree and de-syncs the
comparison for "foo.t", which comes after.
Reported-by: George Shammas <georgyo@gmail.com>
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-02 18:58:21 +00:00
|
|
|
test_path_is_file dir/foo.t &&
|
|
|
|
|
test_path_is_file hello
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'update branch sub' '
|
|
|
|
|
git checkout sub &&
|
|
|
|
|
test_commit bar
|
|
|
|
|
'
|
|
|
|
|
|
2020-10-08 10:13:47 +00:00
|
|
|
test_expect_success 'update topic branch' '
|
|
|
|
|
git checkout topic &&
|
|
|
|
|
git merge -s subtree sub -m "second merge of sub into topic" &&
|
score_trees(): fix iteration over trees with missing entries
In score_trees(), we walk over two sorted trees to find
which entries are missing or have different content between
the two. So if we have two trees with these entries:
one two
--- ---
a a
b c
c d
we'd expect the loop to:
- compare "a" to "a"
- compare "b" to "c"; because these are sorted lists, we
know that the second tree does not have "b"
- compare "c" to "c"
- compare "d" to end-of-list; we know that the first tree
does not have "d"
And prior to d8febde370 (match-trees: simplify score_trees()
using tree_entry(), 2013-03-24) that worked. But after that
commit, we mistakenly increment the tree pointers for every
loop iteration, even when we've processed the entry for only
one side. As a result, we end up doing this:
- compare "a" to "a"
- compare "b" to "c"; we know that we do not have "b", but
we still increment both tree pointers; at this point
we're out of sync and all further comparisons are wrong
- compare "c" to "d" and mistakenly claim that the second
tree does not have "c"
- exit the loop, mistakenly not realizing that the first
tree does not have "d"
So contrary to the claim in d8febde370, we really do need to
manually use update_tree_entry(), because advancing the tree
pointer depends on the entry comparison.
That means we must stop using tree_entry() to access each
entry, since it auto-advances the pointer. Instead:
- we'll use tree_desc.size directly to know if there's
anything left to look at (which is what tree_entry() was
doing under the hood)
- rather than do an extra struct assignment to "e1" and
"e2", we can just access the "entry" field of tree_desc
directly
That makes us a little more intimate with the tree_desc
code, but that's not uncommon for its callers.
The included test shows off the bug by adding a new entry
"bar.t", which sorts early in the tree and de-syncs the
comparison for "foo.t", which comes after.
Reported-by: George Shammas <georgyo@gmail.com>
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-02 18:58:21 +00:00
|
|
|
test_path_is_file dir/bar.t &&
|
|
|
|
|
test_path_is_file dir/foo.t &&
|
|
|
|
|
test_path_is_file hello
|
|
|
|
|
'
|
|
|
|
|
|
2008-02-28 12:36:54 +00:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
|
mkdir git-gui &&
|
|
|
|
|
cd git-gui &&
|
|
|
|
|
git init &&
|
|
|
|
|
echo git-gui > git-gui.sh &&
|
|
|
|
|
o1=$(git hash-object git-gui.sh) &&
|
|
|
|
|
git add git-gui.sh &&
|
|
|
|
|
git commit -m "initial git-gui" &&
|
|
|
|
|
cd .. &&
|
|
|
|
|
mkdir git &&
|
|
|
|
|
cd git &&
|
|
|
|
|
git init &&
|
|
|
|
|
echo git >git.c &&
|
|
|
|
|
o2=$(git hash-object git.c) &&
|
|
|
|
|
git add git.c &&
|
|
|
|
|
git commit -m "initial git"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'initial merge' '
|
|
|
|
|
git remote add -f gui ../git-gui &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git merge -s ours --no-commit --allow-unrelated-histories gui/main &&
|
|
|
|
|
git read-tree --prefix=git-gui/ -u gui/main &&
|
2008-02-28 12:36:54 +00:00
|
|
|
git commit -m "Merge git-gui as our subdirectory" &&
|
2009-11-26 02:23:59 +00:00
|
|
|
git checkout -b work &&
|
2008-02-28 12:36:54 +00:00
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
2018-07-02 00:24:02 +00:00
|
|
|
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
2008-02-28 12:36:54 +00:00
|
|
|
echo "100644 $o2 0 git.c"
|
|
|
|
|
) >expected &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expected actual
|
2008-02-28 12:36:54 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge update' '
|
|
|
|
|
cd ../git-gui &&
|
|
|
|
|
echo git-gui2 > git-gui.sh &&
|
|
|
|
|
o3=$(git hash-object git-gui.sh) &&
|
|
|
|
|
git add git-gui.sh &&
|
2020-09-26 21:04:21 +00:00
|
|
|
git checkout -b topic_2 &&
|
2008-02-28 12:36:54 +00:00
|
|
|
git commit -m "update git-gui" &&
|
|
|
|
|
cd ../git &&
|
2021-07-22 05:04:48 +00:00
|
|
|
git pull --no-rebase -s subtree gui topic_2 &&
|
2008-02-28 12:36:54 +00:00
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
2018-07-02 00:24:02 +00:00
|
|
|
echo "100644 $o3 0 git-gui/git-gui.sh" &&
|
2008-02-28 12:36:54 +00:00
|
|
|
echo "100644 $o2 0 git.c"
|
|
|
|
|
) >expected &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expected actual
|
2008-02-28 12:36:54 +00:00
|
|
|
'
|
|
|
|
|
|
2009-11-26 02:23:59 +00:00
|
|
|
test_expect_success 'initial ambiguous subtree' '
|
|
|
|
|
cd ../git &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git reset --hard main &&
|
2020-09-26 21:04:21 +00:00
|
|
|
git checkout -b topic_2 &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git merge -s ours --no-commit gui/main &&
|
|
|
|
|
git read-tree --prefix=git-gui2/ -u gui/main &&
|
2009-11-26 02:23:59 +00:00
|
|
|
git commit -m "Merge git-gui2 as our subdirectory" &&
|
|
|
|
|
git checkout -b work2 &&
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
2018-07-02 00:24:02 +00:00
|
|
|
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
|
|
|
|
echo "100644 $o1 0 git-gui2/git-gui.sh" &&
|
2009-11-26 02:23:59 +00:00
|
|
|
echo "100644 $o2 0 git.c"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge using explicit' '
|
|
|
|
|
cd ../git &&
|
2020-09-26 21:04:21 +00:00
|
|
|
git reset --hard topic_2 &&
|
2021-07-22 05:04:48 +00:00
|
|
|
git pull --no-rebase -Xsubtree=git-gui gui topic_2 &&
|
2009-11-26 02:23:59 +00:00
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
2018-07-02 00:24:02 +00:00
|
|
|
echo "100644 $o3 0 git-gui/git-gui.sh" &&
|
|
|
|
|
echo "100644 $o1 0 git-gui2/git-gui.sh" &&
|
2009-11-26 02:23:59 +00:00
|
|
|
echo "100644 $o2 0 git.c"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge2 using explicit' '
|
|
|
|
|
cd ../git &&
|
2020-09-26 21:04:21 +00:00
|
|
|
git reset --hard topic_2 &&
|
2021-07-22 05:04:48 +00:00
|
|
|
git pull --no-rebase -Xsubtree=git-gui2 gui topic_2 &&
|
2009-11-26 02:23:59 +00:00
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
2018-07-02 00:24:02 +00:00
|
|
|
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
|
|
|
|
echo "100644 $o3 0 git-gui2/git-gui.sh" &&
|
2009-11-26 02:23:59 +00:00
|
|
|
echo "100644 $o2 0 git.c"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2008-02-23 19:08:25 +00:00
|
|
|
test_done
|