From: Miklos Vajna Date: Tue, 29 Jul 2008 23:17:01 +0000 (+0200) Subject: Add a second testcase for handling invalid strategies in git-merge X-Git-Tag: v1.6.1-rc1~294^2~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dce61e728b89611109e76cbc9fa897fe49d7869d;p=git.git Add a second testcase for handling invalid strategies in git-merge This one tests '-s index' which is interesting because git-merge-index is an existing git command but it is not a valid strategy. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 5eeb6c2b2..0329aee2c 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -230,6 +230,10 @@ test_expect_success 'test option parsing' ' test_must_fail git merge ' +test_expect_success 'reject non-strategy with a git-merge-foo name' ' + test_must_fail git merge -s index c1 +' + test_expect_success 'merge c0 with c1' ' git reset --hard c0 && git merge c1 &&