mirror of
https://github.com/git/git.git
synced 2024-05-30 09:06:07 +02:00
919df31955
The tests for the merge machinery are spread over several places.
Collect them into t64xx for simplicity. Some notes:
t60[234]*.sh:
Merge tests started in t602*, overgrew bisect and remote tracking
tests in t6030, t6040, and t6041, and nearly overtook replace tests
in t6050. This made picking out relevant tests that I wanted to run
in a tighter loop slightly more annoying for years.
t303*.sh:
These started out as tests for the 'merge-recursive' toplevel command,
but did not restrict to that and had lots of overlap with the
underlying merge machinery.
t7405, t7613:
submodule-specific merge logic started out in submodule.c but was
moved to merge-recursive.c in commit 18cfc08866 ("submodule.c: move
submodule merging to merge-recursive.c", 2018-05-15). Since these
tests are about the logic found in the merge machinery, moving these
tests to be with the merge tests makes sense.
t7607, t7609:
Having tests spread all over the place makes it more likely that
additional tests related to a certain piece of logic grow in all those
other places. Much like t303*.sh, these two tests were about the
underlying merge machinery rather than outer levels.
Tests that were NOT moved:
t76[01]*.sh:
Other than the four tests mentioned above, the remaining tests in
t76[01]*.sh are related to non-recursive merge strategies, parameter
parsing, and other stuff associated with the highlevel builtin/merge.c
rather than the recursive merge machinery.
t3[45]*.sh:
The rebase testcases in t34*.sh also test the merge logic pretty
heavily; sometimes changes I make only trigger failures in the rebase
tests. The rebase tests are already nicely coupled together, though,
and I didn't want to mess that up. Similar comments apply for the
cherry-pick tests in t35*.sh.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
153 lines
3.5 KiB
Bash
Executable File
153 lines
3.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='subtree merge strategy'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
s="1 2 3 4 5 6 7 8" &&
|
|
for i in $s; do echo $i; done >hello &&
|
|
git add hello &&
|
|
git commit -m initial &&
|
|
git checkout -b side &&
|
|
echo >>hello world &&
|
|
git add hello &&
|
|
git commit -m second &&
|
|
git checkout master &&
|
|
for i in mundo $s; do echo $i; done >hello &&
|
|
git add hello &&
|
|
git commit -m master
|
|
|
|
'
|
|
|
|
test_expect_success 'subtree available and works like recursive' '
|
|
|
|
git merge -s subtree side &&
|
|
for i in mundo $s world; do echo $i; done >expect &&
|
|
test_cmp expect hello
|
|
|
|
'
|
|
|
|
test_expect_success 'setup branch sub' '
|
|
git checkout --orphan sub &&
|
|
git rm -rf . &&
|
|
test_commit foo
|
|
'
|
|
|
|
test_expect_success 'setup branch main' '
|
|
git checkout -b main master &&
|
|
git merge -s ours --no-commit --allow-unrelated-histories sub &&
|
|
git read-tree --prefix=dir/ -u sub &&
|
|
git commit -m "initial merge of sub into main" &&
|
|
test_path_is_file dir/foo.t &&
|
|
test_path_is_file hello
|
|
'
|
|
|
|
test_expect_success 'update branch sub' '
|
|
git checkout sub &&
|
|
test_commit bar
|
|
'
|
|
|
|
test_expect_success 'update branch main' '
|
|
git checkout main &&
|
|
git merge -s subtree sub -m "second merge of sub into main" &&
|
|
test_path_is_file dir/bar.t &&
|
|
test_path_is_file dir/foo.t &&
|
|
test_path_is_file hello
|
|
'
|
|
|
|
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 &&
|
|
git merge -s ours --no-commit --allow-unrelated-histories gui/master &&
|
|
git read-tree --prefix=git-gui/ -u gui/master &&
|
|
git commit -m "Merge git-gui as our subdirectory" &&
|
|
git checkout -b work &&
|
|
git ls-files -s >actual &&
|
|
(
|
|
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
|
echo "100644 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
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 &&
|
|
git checkout -b master2 &&
|
|
git commit -m "update git-gui" &&
|
|
cd ../git &&
|
|
git pull -s subtree gui master2 &&
|
|
git ls-files -s >actual &&
|
|
(
|
|
echo "100644 $o3 0 git-gui/git-gui.sh" &&
|
|
echo "100644 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'initial ambiguous subtree' '
|
|
cd ../git &&
|
|
git reset --hard master &&
|
|
git checkout -b master2 &&
|
|
git merge -s ours --no-commit gui/master &&
|
|
git read-tree --prefix=git-gui2/ -u gui/master &&
|
|
git commit -m "Merge git-gui2 as our subdirectory" &&
|
|
git checkout -b work2 &&
|
|
git ls-files -s >actual &&
|
|
(
|
|
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
|
echo "100644 $o1 0 git-gui2/git-gui.sh" &&
|
|
echo "100644 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'merge using explicit' '
|
|
cd ../git &&
|
|
git reset --hard master2 &&
|
|
git pull -Xsubtree=git-gui gui master2 &&
|
|
git ls-files -s >actual &&
|
|
(
|
|
echo "100644 $o3 0 git-gui/git-gui.sh" &&
|
|
echo "100644 $o1 0 git-gui2/git-gui.sh" &&
|
|
echo "100644 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'merge2 using explicit' '
|
|
cd ../git &&
|
|
git reset --hard master2 &&
|
|
git pull -Xsubtree=git-gui2 gui master2 &&
|
|
git ls-files -s >actual &&
|
|
(
|
|
echo "100644 $o1 0 git-gui/git-gui.sh" &&
|
|
echo "100644 $o3 0 git-gui2/git-gui.sh" &&
|
|
echo "100644 $o2 0 git.c"
|
|
) >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|