undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7601: extend the 'merge picks up the best result' test

Browse Source 
The test only checked if the best result picking code works if there are
multiple strategies set in the config. Add a similar one that tests if
the same true if the -s option of git merge was used multiple times.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Miklos Vajna 2008-07-22 19:05:59 +02:00 committed by Junio C Hamano
parent 2d71bde2d1
commit 4d175ef71d
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
t/t7601-merge-pull-config.sh
View File

@ -112,6 +112,21 @@ test_expect_success 'setup conflicted merge' '
# recusive is choosen. # recusive is choosen.
test_expect_success 'merge picks up the best result' ' test_expect_success 'merge picks up the best result' '
git config --unset-all pull.twohead &&
git reset --hard c5 &&
git merge -s resolve c6
resolve_count=$(conflict_count) &&
git reset --hard c5 &&
git merge -s recursive c6
recursive_count=$(conflict_count) &&
git reset --hard c5 &&
git merge -s recursive -s resolve c6
auto_count=$(conflict_count) &&
test $auto_count = $recursive_count &&
test $auto_count != $resolve_count
'
test_expect_success 'merge picks up the best result (from config)' '
git config pull.twohead "recursive resolve" && git config pull.twohead "recursive resolve" &&
git reset --hard c5 && git reset --hard c5 &&
git merge -s resolve c6 git merge -s resolve c6