summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorMichele Ballabio <barra_cuda@katamail.com>2008-07-20 14:34:47 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-20 13:37:26 -0700
commit74f5b7fba420eb6b807db48d0ee7a000202f8225 (patch)
tree102b124ac549cac5ecdcac1d0efbacc298d21e7f /t/t7600-merge.sh
parentec96224e215f1b2f143524afa339564271c11e12 (diff)
downloadgit-74f5b7fba420eb6b807db48d0ee7a000202f8225.tar.gz
builtin-merge.c: Fix option parsing
Now "git merge -m" needs a message, and errors out with the usage text if none is given. This way, t7600-merge.sh is fixed. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 26cf8dc7c1..5eeb6c2b27 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -221,7 +221,7 @@ test_expect_success 'setup' '
test_debug 'gitk --all'
-test_expect_failure 'test option parsing' '
+test_expect_success 'test option parsing' '
test_must_fail git merge -$ c1 &&
test_must_fail git merge --no-such c1 &&
test_must_fail git merge -s foobar c1 &&