git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
MFMartin Fick <mfick@codeaurora.org>
Date
May 25, 2012, 18:06 UTC
Message-ID
<201205251206.30783.mfick@codeaurora.org>
In-Reply-To
<CA+55aFwwUzErbcCGa597N4G7i-_mYso+aJO_0aRq0jNBOi9=ew@mail.gmail.com>
On Friday, May 25, 2012 11:20:10 am Linus Torvalds wrote:
> On Fri, May 25, 2012 at 10:05 AM, Junio C Hamano 
<gitster@pobox.com> wrote:
Show 10 quoted lines
> >> 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.
> > 
> Yes. Right now, the conflict line is hidden way at the
> bottom, and I've actually overlooked it several times
> (and I don't think I'm the only one - do "git log
> --grep=Conflicts:" on the kernel tree and you'll see a
> lot of people just leaving them be).

Tangentially related, I think that in the cherry-pick case this can also be a problem. Not exactly the same, but in the cherry-pick case you are generally starting with an existing commit message, and the location of the conflicts at the bottom ends up actually causing functional problems for the interpretations of the old "footer-lines" by some tools.

Notably, our users sometimes cherry-pick gerrit changes but then the old Change-Id footer line gets placed above the conflicts and if they forget to remove the conflicts, the Change-Id footer is not recognized by Gerrit.

So, not only are users forgetting to remove the conflicts, it causes tooling problems in the cherry-pick case by messing with the footer layouts,

-Martin
-- 
Employee of Qualcomm Innovation Center, Inc. which is a 
member of Code Aurora Forum
Previous: Linus TorvaldsNext: Ralf Thielow
Message 4 of 5 in “fmt-merge-message: add empty line between tag and signature verification”
  1. Linus TorvaldsMay 25, 2012
  2. Junio C HamanoMay 25, 2012
  3. Linus TorvaldsMay 25, 2012
  4. Martin FickMay 25, 2012
  5. Ralf ThielowMay 25, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.