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

Re: [PATCH/RFC] fmt-merge-msg: add a blank line after people info

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
May 11, 2012, 23:20 UTC
Message-ID
<CA+55aFyNqncpHydQJYjLu5d2y+gGLVQVV8zk=2ckZ-LLgRRNWA@mail.gmail.com>
In-Reply-To
<7vipg2jpzp.fsf@alter.siamese.dyndns.org>
On Fri, May 11, 2012 at 3:46 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> But I do not know if it is an improvement from the current output before
> your patch, or if it is just wasting vertical space.

So I tend to edit out the "By Xyzzy" and "via So-and-so" lines, although I do find them useful for actually writing the message.

However, if I were to keep them, I think I'd prefer the extra line that Jonathan added.

What I *would* like, though, is that the "via So-and-so" shows up on the same line as the "By Xyzzy", probably together with appropriate word-wrapping (using strbuf_add_wrapped_text()?)

Btw, the counting of commits is broken for the merge people. Do this in the kernel tree, just to see an example of the breakage:

    git checkout -b test-merges 59068e369b6a
    git merge e9e7183fd267
and see the suggested people counts:
    By Mark Brown (2) and others
    via Takashi Iwai (3) and Liam Girdwood (1)
and those "via" numbers make very little sense.

So the "By" number makes sense (counting non-merges). But the "via" numbers are just odd. Seven of the commits were committed by Mark Brown, but he's not mentioned in "via". Presumably because he's already mentioned in the "By" line. But Mark was actually *more* of a "via" person than Liam was, although Takashi is perhaps the most important one because he's the "latest" one things flowed through.

I dunno. But it looks odd, and the above is not the only example of "those counts don't make sense".

Anyway, I think the "via" line is odd the way it is. Lower-case "via" implies that it's a continuation of the "By" sentence, but then it's given a line of its own. Hmm?

                   Linus
                       Linus
Previous: Junio C HamanoNext: Junio C Hamano
Message 28 of 36 in “A possible fmt-merge-msg update?”
  1. Junio C HamanoMar 5, 2012
  2. Linus TorvaldsMar 5, 2012
  3. Junio C HamanoMar 5, 2012
  4. Linus TorvaldsMar 5, 2012
  5. fmt-merge-msg: show those involved in a merged seriesJunio C Hamano, Mar 5, 2012
  6. Linus TorvaldsMar 5, 2012
  7. Junio C HamanoMar 5, 2012
  8. René ScharfeMar 7, 2012
  9. Junio C HamanoMar 7, 2012
  10. René ScharfeMar 8, 2012
  11. Junio C HamanoMar 8, 2012
  12. Junio C HamanoMar 8, 2012
  13. Phil HordMar 12, 2012
  14. Jeff KingMar 13, 2012
  15. Junio C HamanoMar 14, 2012
  16. Phil HordMar 14, 2012
  17. Jonathan NiederMar 12, 2012
  18. Junio C HamanoMar 13, 2012
  19. Jonathan NiederMar 13, 2012
  20. Junio C HamanoMar 13, 2012
  21. Johannes SixtMar 13, 2012
  22. Junio C HamanoMar 13, 2012
  23. Johannes SixtMar 14, 2012
  24. Junio C HamanoMar 14, 2012
  25. 1/1 fmt-merge-msg: show those involved in a merged seriesJunio C Hamano, Mar 13, 2012
  26. fmt-merge-msg: add a blank line after people infoJonathan Nieder, May 11, 2012
  27. Junio C HamanoMay 11, 2012
  28. Linus TorvaldsMay 11, 2012
  29. Junio C HamanoMay 14, 2012
  30. Junio C HamanoMay 15, 2012
  31. Linus TorvaldsMay 16, 2012
  32. Junio C HamanoMay 16, 2012
  33. Jonathan NiederJun 6, 2012
  34. Jonathan NiederJun 6, 2012
  35. Junio C HamanoJun 6, 2012
  36. Jeff KingMar 6, 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.