Re: git-format-patch --subject-prefix support.
- From
Junio C Hamano <junkio@cox.net>
- Date
- Apr 12, 2007, 10:04 UTC
- Message-ID
- <7vslb5kiy2.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7v4pnmmk9l.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
Show 14 quoted lines
> Julian Phillips <julian@quantumfyre.co.uk> writes: > >> On Wed, 11 Apr 2007, Junio C Hamano wrote: >> >>> "Robin H\. Johnson" <robbat2@gentoo.org> writes: >>> >>>> Add a new option to git-format-patch, entitled --subject-prefix that allows >>>> control of the subject prefix '[PATCH]'. Using this option, the text 'PATCH' is >>>> replaced with whatever input is provided to the option. This allows easily >>>> generating patches like '[PATCH 2.6.21-rc3]' or properly numbered series like >>>> '[-mm3 PATCH N/M]'. >>>> >>>> 1/2 - Implementation and documentation >>>> 2/2 - Test case
Gaah.
I applied it, pushed the results out and then found breakage. How much I hate these random and non-essential "mean well to enhance usability" patches X-<...
In the meantime, I think this should fix it. Please test well.
-- >8 -- Fix git {log,show,...} --pretty=email
An earlier --subject-prefix forgot that format-patch is not the only codepath that added the "[PATCH]" prefix, breaking everybody else in the log family.
Signed-off-by: Junio C Hamano <junkio@cox.net> --- builtin-log.c | 1 - revision.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c index 4a4890a..ffc269a 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -435,7 +435,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.ignore_merges = 1; rev.diffopt.msg_sep = ""; rev.diffopt.recursive = 1; - rev.subject_prefix = "PATCH"; rev.extra_headers = extra_headers; diff --git a/revision.c b/revision.c index 486393c..37f1eab 100644 --- a/revision.c +++ b/revision.c @@ -567,6 +567,7 @@ void init_revisions(struct rev_info *revs, const char *prefix) revs->min_age = -1; revs->skip_count = -1; revs->max_count = -1; + revs->subject_prefix = "PATCH"; revs->prune_fn = NULL; revs->prune_data = NULL;