{"thread":{"id":"14547","subject":"[PATCH] builtin-merge.c: Fix option parsing","startedAt":"2008-07-20T12:34:47Z","lastAt":"2008-07-20T13:08:25Z","messageCount":2,"participants":["Michele Ballabio","Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"84028","messageId":"200807201434.47545.barra_cuda@katamail.com","threadId":"14547","inReplyTo":null,"subject":"[PATCH] builtin-merge.c: Fix option parsing","fromName":"Michele Ballabio","fromEmail":"barra_cuda@katamail.com","sentAt":"2008-07-20T12:34:47Z","receivedAt":"2008-07-20T12:34:47Z","isPatch":true,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"Now \"git merge -m\" needs a message, and errors out with the usage\ntext if none is given.\nThis way, t7600-merge.sh is fixed.\n\nSigned-off-by: Michele Ballabio <barra_cuda@katamail.com>\n---\n builtin-merge.c  |    5 +++--\n t/t7600-merge.sh |    2 +-\n 2 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex 129b4e6..84a541d 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -68,10 +68,11 @@ static int option_parse_message(const struct option *opt,\n \n \tif (unset)\n \t\tstrbuf_setlen(buf, 0);\n-\telse {\n+\telse if (arg) {\n \t\tstrbuf_addf(buf, \"%s\\n\\n\", arg);\n \t\thave_message = 1;\n-\t}\n+\t} else\n+\t\treturn error(\"switch `m' requires a value\");\n \treturn 0;\n }\n \ndiff --git a/t/t7600-merge.sh b/t/t7600-merge.sh\nindex 26cf8dc..5eeb6c2 100755\n--- a/t/t7600-merge.sh\n+++ b/t/t7600-merge.sh\n@@ -221,7 +221,7 @@ test_expect_success 'setup' '\n \n test_debug 'gitk --all'\n \n-test_expect_failure 'test option parsing' '\n+test_expect_success 'test option parsing' '\n \ttest_must_fail git merge -$ c1 &&\n \ttest_must_fail git merge --no-such c1 &&\n \ttest_must_fail git merge -s foobar c1 &&\n-- \n1.5.6.3\n"},{"id":"84035","messageId":"20080720130825.GG10347@genesis.frugalware.org","threadId":"14547","inReplyTo":"200807201434.47545.barra_cuda@katamail.com","subject":"Re: [PATCH] builtin-merge.c: Fix option parsing","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-20T13:08:25Z","receivedAt":"2008-07-20T13:08:25Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Sun, Jul 20, 2008 at 02:34:47PM +0200, Michele Ballabio <barra_cuda@katamail.com> wrote:\n> Now \"git merge -m\" needs a message, and errors out with the usage\n> text if none is given.\n> This way, t7600-merge.sh is fixed.\n\nThanks, I was about to fix this, but you were faster. ;-)\n"}]}