Re: fmt-merge-message: add empty line between tag and signature verification

From: Junio C Hamano <gitster@pobox.com>
Date: May 25, 2012, 17:05 UTC
Message-ID: <7vtxz4tcmn.fsf@alter.siamese.dyndns.org>
In-Reply-To: <alpine.LFD.2.02.1205250850001.19607@i5.linux-foundation.org>

Linus Torvalds <torvalds@linux-foundation.org> writes:

Show 23 quoted lines

> When adding the information from a tag, put an empty line between the 
> message of the tag and the commented-out signature verification 
> information.
>
> At least for the kernel workflow, I often end up re-formatting the message 
> that people send me in the tag data. In that situation, putting the tag 
> message and the tag signature verification back-to-back then means that 
> normal editor "reflow parapgraph" command will get confused and think that 
> the signature is a continuation of the last message paragraph.
>
> So I always end up having to first add an empty line, and then go back and 
> reflow the last paragraph. Let's just do it in git directly.
>
> The extra vertical space also makes the verification visually stand out 
> more from the user-supplied message, so it looks a bit more readable to me 
> too, but that may be just an odd personal preference.
>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> ---
> This is a throw-away patch - apply or not as you prefer. I thought I'd 
> send it out and see what people thought.
>
> I don't feel *that* strongly about it.

Speaking as one of "people" (as opposed to "the maintainer to decide one way or the other in bikeshedding"), I think this makes sense.

> Btw, I'd also like to see the merge notes (notably the conflict file list) 
> before the generated shortlog, but that seems to really not work with the 
> current fmt-merge-message model.  Oh well.

Postponing to assess if such a change is feasible, I am not sure if that ordering makes more sense than the current one. Is the objective to more strongly motivate people to explain what happened to the conflicts?