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

Re: storing cover letter of a patch series?

From
Duy Nguyen <pclouds@gmail.com>
Date
Aug 15, 2016, 09:40 UTC
Message-ID
<CACsJy8BdmR5USJvjJ6xbjj=bP787tdS72_oL+PDq0D+FPYmiPA@mail.gmail.com>
In-Reply-To
<CAGZ79kb27JZepMD5AmrHjOnf8haE8LehZd_CkvOQ1UoLEDuxKQ@mail.gmail.com>
On Mon, Aug 15, 2016 at 1:28 PM, Stefan Beller <sbeller@google.com> wrote:
Show 25 quoted lines
> On Sun, Aug 14, 2016 at 12:15 AM, Jacob Keller <jacob.keller@gmail.com> wrote:
>> On Sat, Aug 13, 2016 at 1:49 AM, Duy Nguyen <pclouds@gmail.com> wrote:
>>> On Tue, Aug 9, 2016 at 12:27 AM, Stefan Beller <sbeller@google.com> wrote:
>>>> is what you want. Maybe we want to see a patch that adds the reverse
>>>> functionality as well, i.e. git-am will store the the cover letter as the
>>>> branch description and git-merge will propose the branch description for
>>>> the merge commit.
>>>
>>> I almost suggested the same, but there is a problem with this
>>> approach: if you're are on a detached head, where does git-am save it?
>
> What would the user expect? We can have a range of expectations:
> 1) reject and error out git-am
> 2) warn about not saving branch.description and continue with am
> 3) have a (maybe special) branch.HEAD.description thing, same for FETCH_HEAD etc
> 4) have a config option to choose between 1 and 2, if unset default to 1
>
> I think 3 is a bad choice.
> 4 seems reasonable to me, though I wonder if some people use git-am in
> a scripted workflow with a detached head and then create the branch afterwards?
> So
>
> 5) create a branch for them? (such as $(date)-${subject})
>
> My gut reaction doesn't like 5 either.

I'm starting to think option 6 (storing cover latter as an empty commit at tip then git-merge replaces it with a merge commit in a permanent history) may be the way to go. It handles detached heads just fine, we have reflog to store older cover letters. Though it will not play nice with 'git commit --amend' and 'git reset' for people who rewrites history heavily during development, but maybe 'git rebase -i --autosquash' would be an ok workflow alternative.

-- 
Duy
Previous: Jacob KellerNext: Philip Oakley
Message 45 of 57 in “storing cover letter of a patch series?”
  1. Jacob KellerSep 10, 2015
  2. Junio C HamanoSep 10, 2015
  3. Martin FickSep 10, 2015
  4. Jacob KellerSep 10, 2015
  5. Junio C HamanoSep 10, 2015
  6. Junio C HamanoSep 11, 2015
  7. Michael S. TsirkinAug 4, 2016
  8. Junio C HamanoAug 5, 2016
  9. Martin FickAug 5, 2016
  10. Junio C HamanoAug 5, 2016
  11. Junio C HamanoAug 6, 2016
  12. Michael S. TsirkinAug 7, 2016
  13. John KeepingAug 7, 2016
  14. Duy NguyenAug 7, 2016
  15. Junio C HamanoAug 8, 2016
  16. Michael J GruberAug 9, 2016
  17. Jacob KellerSep 10, 2015
  18. Junio C HamanoSep 10, 2015
  19. Jacob KellerSep 10, 2015
  20. Philip OakleySep 10, 2015
  21. Jacob KellerSep 10, 2015
  22. Michael S. TsirkinAug 4, 2016
  23. Johannes SchindelinSep 10, 2015
  24. Jacob KellerSep 10, 2015
  25. Johannes SchindelinSep 10, 2015
  26. Philip OakleySep 10, 2015
  27. doc: show usage of branch descriptionPhilip Oakley, Sep 12, 2015
  28. Jacob KellerSep 12, 2015
  29. Philip OakleySep 14, 2015
  30. Philip OakleySep 14, 2015
  31. Junio C HamanoSep 14, 2015
  32. Philip OakleySep 15, 2015
  33. Philip OakleySep 15, 2015
  34. doc: show usage of branch descriptionPhilip Oakley, Sep 14, 2015
  35. Chris PackhamSep 11, 2015
  36. Simon GlassSep 18, 2015
  37. Stefan BellerAug 8, 2016
  38. Junio C HamanoAug 8, 2016
  39. Duy NguyenAug 13, 2016
  40. Jacob KellerAug 14, 2016
  41. Stefan BellerAug 15, 2016
  42. Jacob KellerAug 15, 2016
  43. Stefan BellerAug 15, 2016
  44. Jacob KellerAug 15, 2016
  45. Duy NguyenAug 15, 2016
  46. Philip OakleyAug 15, 2016
  47. Duy NguyenAug 15, 2016
  48. John KeepingAug 15, 2016
  49. Jacob KellerAug 15, 2016
  50. Junio C HamanoAug 15, 2016
  51. Jacob KellerAug 15, 2016
  52. Philip OakleyAug 15, 2016
  53. Duy NguyenAug 16, 2016
  54. Jacob KellerAug 16, 2016
  55. Duy NguyenAug 16, 2016
  56. Jacob KellerAug 16, 2016
  57. Philip OakleyAug 16, 2016

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.