diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-21 18:10:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-21 22:29:46 -0700 |
| commit | 1719b5e446f54e4196903ae6ed5f8867a5755bf6 (patch) | |
| tree | 933449ee7ff043fc7e01d9dca0348eaf6a21e56c /t/t7601-merge-pull-config.sh | |
| parent | ac2e28c0a43ced3837fbbcf66fd693244b6c6693 (diff) | |
| download | git-1719b5e446f54e4196903ae6ed5f8867a5755bf6.tar.gz | |
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-x | t/t7601-merge-pull-config.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 95b4d71c51..6b9f6388c7 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 |