From: Miklos Vajna Date: Sat, 26 Jul 2008 11:54:45 GMT Subject: [PATCH] t7601: extend the 'merge picks up the best result' test Message-ID: <1217073292-27945-1-git-send-email-vmiklos@frugalware.org> In-Reply-To: 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 --- On Tue, Jul 22, 2008 at 01:24:14AM -0700, Junio C Hamano wrote: > Don't. pull.* has always been defined as "list of strategies", and -s > has > always been defined to take "a" strategy. OK. Here is a testcase for the later. As far as I see the behaviour of multiple -s was not checked till now. t/t7601-merge-pull-config.sh | 15 +++++++++++++++ 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 -- 1.5.6.4.433.g09651.dirty