From: Miklos Vajna Date: Tue, 29 Jul 2008 23:17:01 GMT Subject: [PATCH 4/4] Add a second testcase for handling invalid strategies in git-merge Message-ID: In-Reply-To: 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 --- t/t7600-merge.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 5eeb6c2..0329aee 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 && -- 1.6.0.rc0.14.g95f8.dirty