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

Re: [RFC 3/3] log: add an option to generate cover letter from a branch tip

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 14, 2017, 13:05 UTC
Message-ID
<xmqqo9o52ep0.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<92c426bc-5ce9-da7c-5f10-66b5fc46825b@suse.de>
Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.de> writes:
Show 5 quoted lines
> The triple dash is so that the diffstat/shortlog as not seen as
> part of the cover letter.  As said in the cover letter for this
> series, it kinda breaks legacy behaviour right now.  It should
> either be printed only for cover-at-tip, or a new separator should
> be added.

This reminds me of a couple of random thoughts I had, so before I disconnect from my terminal and forget about them...

[1] format-patch and am must round-trip.

I mentioned four uses cases around the "cover letter at the tip" in my earlier message

    https://public-inbox.org/git/xmqqbmk68o9d.fsf@gitster.mtv.corp.google.com/

Specifically, (2) we should be able to run "format-patch" and record the log message of the empty commit at the tip to the cover letter, and (4) we should be able to accept such output with "am" and end up with the same sequence of commits as the original (modulo committer identity and timestamps). So from the output we produce with this step, "am" should be able to split the material that came from the original empty commit from the surrounding cruft like shortlog and diffstat. The output format of this step needs to be designed with that in mind.

[2] reusing cover letter material in merge may not be ideal.

When people write a cover letter, they write different things in it. What they wanted to achieve, why they chose the approach they took, how the series is organized, which part of the series they find iffy and/orneeds special attention from the reviewers, where to find the previous iteration, what changed since the previous iterations, etc.

All of them are to help the reviewers, many of who have already looked at the previous rounds, to understand and judge this round of the submission.

The message in a merge commit as a part of the final history, however, cannot refer to anything from "previous rounds", as the previous attempts are not part of the final history readers of "git log" can refer to whey they are trying to understand the merge. What exactly goes in a merge commit and how the messages are phrased may be different from project to project, but for this project, I've been trying to write them in an end-user facing terms, i.e. they are designed in such a way that "git log --first-parent --merges" can be read as if they were entries in the release notes, summarizing fixes and features by describing their user-visible effects. This is only one part of what people write in their cover letters (i.e. "what they wanted to achive").

So there probably needs a convention meant to be followed by human users when writing cover letters, so a mechanical process can tell which part of the text is to be made into the merge commit without understanding human languages.

Previous: Nicolas Morey-ChaisemartinNext: Nicolas Morey-Chaisemartin
Message 22 of 25 in “[RFC] cover-at-tip”
  1. Nicolas Morey-ChaisemartinNov 10, 2017
  2. Nicolas Morey-ChaisemartinNov 10, 2017
  3. Junio C HamanoNov 10, 2017
  4. Nicolas Morey-ChaisemartinNov 13, 2017
  5. Junio C HamanoNov 13, 2017
  6. Junio C HamanoNov 13, 2017
  7. Nicolas Morey-ChaisemartinNov 13, 2017
  8. 0/3 Add support for --cover-at-tipNicolas Morey-Chaisemartin, Nov 13, 2017
  9. Jonathan TanNov 13, 2017
  10. Nicolas Morey-ChaisemartinNov 13, 2017
  11. 1/3 mailinfo: extract patch series idNicolas Morey-Chaisemartin, Nov 13, 2017
  12. Junio C HamanoNov 14, 2017
  13. Nicolas Morey-ChaisemartinNov 14, 2017
  14. 2/3 am: semi working --cover-at-tipNicolas Morey-Chaisemartin, Nov 13, 2017
  15. Junio C HamanoNov 14, 2017
  16. Nicolas Morey-ChaisemartinNov 14, 2017
  17. Nicolas Morey-ChaisemartinNov 16, 2017
  18. Junio C HamanoNov 17, 2017
  19. 3/3 log: add an option to generate cover letter from a branch tipNicolas Morey-Chaisemartin, Nov 13, 2017
  20. Junio C HamanoNov 14, 2017
  21. Nicolas Morey-ChaisemartinNov 14, 2017
  22. Junio C HamanoNov 14, 2017
  23. Nicolas Morey-ChaisemartinNov 14, 2017
  24. Junio C HamanoNov 14, 2017
  25. Jonathan TanNov 10, 2017

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.