git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: Notes in format-patch
Date: Tue, 13 Nov 2012 09:26:28 -0800	[thread overview]
Message-ID: <7vr4nxe7nf.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vzk2le918.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 13 Nov 2012 08:56:35 -0800")

Junio C Hamano <gitster@pobox.com> writes:

> 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) {

... and it is broken X-<.

The blank line should be added before the diffstat, not after the
notes message (t3307 shows a case where we give notes without
diffstat, and we shouldn't be adding an extra blank line in that
case.

  reply	other threads:[~2012-11-13 17:26 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-26 13:33 [PATCH] replace: parse revision argument for -d Michael J Gruber
2012-10-26 15:25 ` Christian Couder
2012-10-29  6:58 ` Jeff King
2012-10-29  9:02   ` Michael J Gruber
2012-10-29  9:04     ` Jeff King
2012-10-29 10:08       ` Michael J Gruber
2012-10-29 13:23         ` [PATCHv2] " Michael J Gruber
2012-11-09 16:48           ` Jeff King
2012-11-12  8:51             ` Michael J Gruber
2012-11-12 14:18               ` [PATCHv3] " Michael J Gruber
2012-11-12 20:42                 ` Jeff King
2012-11-13 10:25                   ` Michael J Gruber
2012-11-13 10:34                     ` [PATCHv4] " Michael J Gruber
2012-11-13 13:37                       ` Jeff King
2012-11-13 10:30                 ` Notes in format-patch (was: Re: [PATCHv3] replace: parse revision argument for -d) Michael J Gruber
2012-11-13 13:38                   ` Jeff King
2012-11-13 16:29                   ` Notes in format-patch Junio C Hamano
2012-11-13 16:56                     ` Junio C Hamano
2012-11-13 17:26                       ` Junio C Hamano [this message]
2012-11-13 18:09                         ` Junio C Hamano
2012-11-14  9:17                           ` Michael J Gruber
2012-11-14 13:15                             ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vr4nxe7nf.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).