From 74f5b7fba420eb6b807db48d0ee7a000202f8225 Mon Sep 17 00:00:00 2001
From: Michele Ballabio <barra_cuda@katamail.com>
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 <barra_cuda@katamail.com>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin-merge.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'builtin-merge.c')

diff --git a/builtin-merge.c b/builtin-merge.c
index 06b9970306..e97c79e60c 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -66,10 +66,11 @@ static int option_parse_message(const struct option *opt,
 
 	if (unset)
 		strbuf_setlen(buf, 0);
-	else {
+	else if (arg) {
 		strbuf_addf(buf, "%s\n\n", arg);
 		have_message = 1;
-	}
+	} else
+		return error("switch `m' requires a value");
 	return 0;
 }
 
-- 
cgit v1.2.1