Do not misidentify "git merge foo HEAD" as an old-style invocation

gitster · gitster · commit 76bf488e61b8 · 2009-12-02T10:01:59.000-08:00
This was misinterpreted as an ancient style "git merge &lt;message&gt; HEAD
&lt;commit&gt; &lt;commit&gt;..." that merges one (or more) &lt;commit&gt; into the current
branch and record the resulting commit with the given message.  Then a
later sanity check found that there is no &lt;commit&gt; specified and gave
a usage message.

Tested-by: Nanako Shiraishi &lt;nanako3@lavabit.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-merge.c b/builtin-merge.c
@@ -792,7 +792,7 @@ static int suggest_conflicts(void)
 static struct commit *is_old_style_invocation(int argc, const char **argv)
 {
 	struct commit *second_token = NULL;
-	if (argc > 1) {
+	if (argc > 2) {
 		unsigned char second_sha1[20];
 
 		if (get_sha1(argv[1], second_sha1))

Original file line number	Diff line number	Diff line change
`@@ -792,7 +792,7 @@ static int suggest_conflicts(void)`
`792`	`792`	`static struct commit is_old_style_invocation(int argc, const char *argv)`
`793`	`793`	`{`
`794`	`794`	`struct commit *second_token = NULL;`
`795`		`- if (argc > 1) {`
	`795`	`+ if (argc > 2) {`
`796`	`796`	`unsigned char second_sha1[20];`
`797`	`797`
`798`	`798`	`if (get_sha1(argv[1], second_sha1))`