mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00: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>
108 lines
2.6 KiB
Bash
Executable file
108 lines
2.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Merge-recursive ours and theirs variants'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
for i in 1 2 3 4 5 6 7 8 9
|
|
do
|
|
echo "$i"
|
|
done >file &&
|
|
git add file &&
|
|
cp file elif &&
|
|
git commit -m initial &&
|
|
|
|
sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
|
|
git commit -a -m ours &&
|
|
|
|
git checkout -b side HEAD^ &&
|
|
|
|
sed -e "s/9/nueve/" >file <elif &&
|
|
git commit -a -m theirs &&
|
|
|
|
git checkout master^0
|
|
'
|
|
|
|
test_expect_success 'plain recursive - should conflict' '
|
|
git reset --hard master &&
|
|
test_must_fail git merge -s recursive side &&
|
|
grep nine file &&
|
|
grep nueve file &&
|
|
! grep 9 file &&
|
|
grep one file &&
|
|
! grep 1 file
|
|
'
|
|
|
|
test_expect_success 'recursive favouring theirs' '
|
|
git reset --hard master &&
|
|
git merge -s recursive -Xtheirs side &&
|
|
! grep nine file &&
|
|
grep nueve file &&
|
|
! grep 9 file &&
|
|
grep one file &&
|
|
! grep 1 file
|
|
'
|
|
|
|
test_expect_success 'recursive favouring ours' '
|
|
git reset --hard master &&
|
|
git merge -s recursive -X ours side &&
|
|
grep nine file &&
|
|
! grep nueve file &&
|
|
! grep 9 file &&
|
|
grep one file &&
|
|
! grep 1 file
|
|
'
|
|
|
|
test_expect_success 'binary file with -Xours/-Xtheirs' '
|
|
echo file binary >.gitattributes &&
|
|
|
|
git reset --hard master &&
|
|
git merge -s recursive -X theirs side &&
|
|
git diff --exit-code side HEAD -- file &&
|
|
|
|
git reset --hard master &&
|
|
git merge -s recursive -X ours side &&
|
|
git diff --exit-code master HEAD -- file
|
|
'
|
|
|
|
test_expect_success 'pull passes -X to underlying merge' '
|
|
git reset --hard master && git pull -s recursive -Xours . side &&
|
|
git reset --hard master && git pull -s recursive -X ours . side &&
|
|
git reset --hard master && git pull -s recursive -Xtheirs . side &&
|
|
git reset --hard master && git pull -s recursive -X theirs . side &&
|
|
git reset --hard master && test_must_fail git pull -s recursive -X bork . side
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'symlink with -Xours/-Xtheirs' '
|
|
git reset --hard master &&
|
|
git checkout -b two master &&
|
|
ln -s target-zero link &&
|
|
git add link &&
|
|
git commit -m "add link pointing to zero" &&
|
|
|
|
ln -f -s target-two link &&
|
|
git commit -m "add link pointing to two" link &&
|
|
|
|
git checkout -b one HEAD^ &&
|
|
ln -f -s target-one link &&
|
|
git commit -m "add link pointing to one" link &&
|
|
|
|
# we expect symbolic links not to resolve automatically, of course
|
|
git checkout one^0 &&
|
|
test_must_fail git merge -s recursive two &&
|
|
|
|
# favor theirs to resolve to target-two?
|
|
git reset --hard &&
|
|
git checkout one^0 &&
|
|
git merge -s recursive -X theirs two &&
|
|
git diff --exit-code two HEAD link &&
|
|
|
|
# favor ours to resolve to target-one?
|
|
git reset --hard &&
|
|
git checkout one^0 &&
|
|
git merge -s recursive -X ours two &&
|
|
git diff --exit-code one HEAD link
|
|
|
|
'
|
|
|
|
test_done
|