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 <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Miklos Vajna committed
Jul 30, 2008 at 01:17 UTC
dce61e728b89611109e76cbc9fa897fe49d7869d
1 file changed
+4
t/t7600-merge.sh
+4
@@ -230,6 +230,10 @@ test_expect_success 'test option parsing' '
230
test_must_fail git merge
231
'
232
233
+test_expect_success 'reject non-strategy with a git-merge-foo name' '
234
+ test_must_fail git merge -s index c1
235
+'
236
+
237
test_expect_success 'merge c0 with c1' '
238
git reset --hard c0 &&
239
git merge c1 &&