summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-07-21 16:10:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-22 05:29:46 (GMT)
commit1719b5e446f54e4196903ae6ed5f8867a5755bf6 (patch)
tree933449ee7ff043fc7e01d9dca0348eaf6a21e56c /t/t7601-merge-pull-config.sh
parentac2e28c0a43ced3837fbbcf66fd693244b6c6693 (diff)
downloadgit-1719b5e446f54e4196903ae6ed5f8867a5755bf6.zip
git-1719b5e446f54e4196903ae6ed5f8867a5755bf6.tar.gz
git-1719b5e446f54e4196903ae6ed5f8867a5755bf6.tar.bz2
builtin-merge: give a proper error message for invalid strategies in config
'git merge -s foobar' diagnosed invalid "foobar" strategy and errored out with a message, but foobar in pull.twohead or pull.octopus was just silently ignored. This makes invalid strategy both on the command line and in the configuration file to trigger the same error. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7601-merge-pull-config.sh')
-rwxr-xr-xt/t7601-merge-pull-config.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 95b4d71..6b9f638 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -126,4 +126,16 @@ test_expect_success 'merge picks up the best result' '
test $auto_count != $resolve_count
'
+test_expect_success 'merge errors out on invalid strategy' '
+ git config pull.twohead "foobar" &&
+ git reset --hard c5 &&
+ test_must_fail git merge c6
+'
+
+test_expect_success 'merge errors out on invalid strategy' '
+ git config --unset-all pull.twohead &&
+ git reset --hard c5 &&
+ test_must_fail git merge -s "resolve recursive" c6
+'
+
test_done