mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
fd48b46474
The -Xours/-Xtheirs merge options were originally defined as a way
to "force" the resolution of 3way textual merge conflicts to take
one side without using your editor, hence did not even trigger in
situations where you would normally not get the <<< === >>> conflict
markers.
This was improved for binary files back in 2012 with a944af1d
("merge: teach -Xours/-Xtheirs to binary ll-merge driver",
2012-09-08).
Teach a similar trick to the codepath that deals with merging two
conflicting changes to symbolic links.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tested-by: Yaroslav Halchenko <yoh@onerussian.com>
Reviewed-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
|