Re: Notes in format-patch
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 13, 2012, 16:56 UTC
- Message-ID
- <7vzk2le918.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <7vhaotfou6.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 27 quoted lines
> Michael J Gruber <git@drmicha.warpmail.net> writes: > >> Michael J Gruber venit, vidit, dixit 12.11.2012 15:18: >>> 'git replace' parses the revision arguments when it creates replacements >>> (so that a sha1 can be abbreviated, e.g.) but not when deleting >>> replacements. >>> >>> Make it parse the argument to 'replace -d' in the same way. >>> >>> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> >>> --- >>> >>> Notes: >>> v3 safeguards the hex buffer against reuse >>> builtin/replace.c | 16 ++++++++++------ >>> t/t6050-replace.sh | 11 +++++++++++ >>> 2 files changed, 21 insertions(+), 6 deletions(-) >>> >>> diff --git a/builtin/replace.c b/builtin/replace.c >> >> By the way - Junio, is that the intented outcome of "format-patch >> --notes"? I would rather put the newline between the note and the >> diffstat... > > I do not mind (actually I personally would prefer to see) a blank > line between the three-dash and "Notes:", but I agree that we should > have a blank line before the diffstat block.
As the topic seems to be already in Peff's next, here is a trivial fix for this in incremental form.
-- >8 -- Subject: format-patch: add a blank line between notes and diffstat
The last line of the note text comes immediately before the diffstat block, making the latter unnecessarily harder to view.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- log-tree.c | 1 + 1 file changed, 1 insertion(+)
diff --git i/log-tree.c w/log-tree.c index 712a22b..9303fd8 100644 --- i/log-tree.c +++ w/log-tree.c @@ -683,6 +683,7 @@ void show_log(struct rev_info *opt) opt->shown_dashes = 1; } strbuf_addstr(&msgbuf, ctx.notes_message); + strbuf_addch(&msgbuf, '\n'); } if (opt->show_log_size) {