Re: [PATCH v2] builtin/merge_recursive.c: Add an usage string and make use of it.

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Aug 30, 2010, 02:42 UTC
Message-ID: <20100830024259.GC4010@burratino>
In-Reply-To: <9e0261a0eebe275e2ed1fa651e5ab80c35f6048c.1283120150.git.tfransosi@gmail.com>

Thiago Farina wrote:

Show 5 quoted lines

> The previous output for git merger-recursive was:
> usage: merge-recursive <base>... -- <head> <remote> ...
> 
> Now the output is:
> usage: git merge-recursive <base>... -- <head> <remote> ...

[...]

Show 8 quoted lines

> --- a/builtin/merge-recursive.c
> +++ b/builtin/merge-recursive.c
> @@ -3,6 +3,9 @@
>  #include "tag.h"
>  #include "merge-recursive.h"
>  
> +static const char builtin_merge_recursive_usage[] =
> +	"git %s <base>... -- <head> <remote> ...";

Now that you've researched it, wouldn't it make sense to include an explanation for this %s in the log message?

Still, ack on this part.

Show 6 quoted lines

> @@ -37,19 +40,19 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
>  		if (!prefixcmp(arg, "--")) {
>  			if (!arg[2])
>  				break;
> -			if (!strcmp(arg+2, "ours"))
> +			if (!strcmp(arg + 2, "ours"))

My comment on the rest still applies: it is best if patches do not contain unrelated changes to unrelated parts of the files they touch.