Automagically enable numbering if we output more than one patch. Signed-off-by: Mike Hommey <mh@xxxxxxxxxxxx> --- On Mon, Oct 22, 2007 at 10:44:12AM +0100, Johannes Schindelin wrote: > Hi, > > On Sun, 21 Oct 2007, Andreas Ericsson wrote: > > > [PATCH 1/1] looks a bit silly, and automagically handling this in > > git-format-patch makes some scripting around it a lot more pleasant. > > I think you should not use "-n" if you do not want to have the numbers. > In circumstances as yours, where you can have patch series larger than > one, I imagine that the "[PATCH 1/1]" bears an important information, > which is not present in "[PATCH]": this patch series contains only one > patch. > > IOW I do not like your patch: too much DWIDNS (Do What I Did NOT Say) for > me. How about the contrary ? Documentation/git-format-patch.txt | 3 ++- builtin-log.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index f0617ef..b77daed 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -56,7 +56,8 @@ If -o is specified, output files are created in <dir>. Otherwise they are created in the current working directory. If -n is specified, instead of "[PATCH] Subject", the first line -is formatted as "[PATCH n/m] Subject". +is formatted as "[PATCH n/m] Subject". This is the default when +there is more than one commit to prepare patches for. If given --thread, git-format-patch will generate In-Reply-To and References headers to make the second and subsequent patch mails appear diff --git a/builtin-log.c b/builtin-log.c index 8b2bf63..640d6e7 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -642,6 +642,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) list[nr - 1] = commit; } total = nr; + if (!keep_subject && total > 1) + numbered = 1; if (numbered) rev.total = total + start_number - 1; rev.add_signoff = add_signoff; -- 1.5.3.5 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
