From 74f5b7fba420eb6b807db48d0ee7a000202f8225 Mon Sep 17 00:00:00 2001 From: Michele Ballabio Date: Sun, 20 Jul 2008 14:34:47 +0200 Subject: 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 Acked-by: Miklos Vajna Signed-off-by: Junio C Hamano --- t/t7600-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t7600-merge.sh') 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 && -- cgit v1.2.3