summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-07-22 17:05:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-23 18:33:40 (GMT)
commit4d175ef71d60086b898e4d871e699794d6a93dbf (patch)
tree2a4191544775ca471f72b98261bcf94c90a0cf59
parent2d71bde2d1a8f4e1c06cb8049a794ba4ba35d37d (diff)
downloadgit-4d175ef71d60086b898e4d871e699794d6a93dbf.zip
git-4d175ef71d60086b898e4d871e699794d6a93dbf.tar.gz
git-4d175ef71d60086b898e4d871e699794d6a93dbf.tar.bz2
t7601: extend the 'merge picks up the best result' test
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>
-rwxr-xr-xt/t7601-merge-pull-config.sh15
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 6b9f638..55aa6b5 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -112,6 +112,21 @@ test_expect_success 'setup conflicted merge' '
# recusive is choosen.
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 reset --hard c5 &&
git merge -s resolve c6