Andrew's git / gitweb.git / diff
?
Add a second testcase for handling invalid strategies in git-merge
authorMiklos Vajna <vmiklos@frugalware.org>
Tue, 29 Jul 2008 23:17:01 +0000 (01:17 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jul 2008 06:21:36 +0000 (23:21 -0700)
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 <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7600-merge.sh patch | blob | history
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 5eeb6c2b2708d582a6e86cd2e06e2b00b7b7b391..0329aee2cde2cbca720183213ff97e60b0e960ee 100755 (executable)
--- 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 &&