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

Re: [PATCH] commit -s: allow "(cherry picked " lines in sign-off section

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 17, 2010, 16:46 UTC
Message-ID
<7vd3q3hp8e.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20101116233649.GA30700@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 7 quoted lines
> How is the cherry-pick event different from the send-by-mail-and-apply
> event?
>
> In both cases, the result has a distinct commit id and distinct
> signoff and it is unlikely that the previous patch handler was testing
> with the same tree as the next one.  (And each patch handler should add
> relevant comments if the new situation warrants that.)

Fair enough. If that is the direction we would want to go, perhaps it suggests that we might eventually want to use "Cherry-picked-from: " as the marker for this information?

And if we go that route, and if this information is being used, we have a rather serious backward compatibility problem. Older scripts will break, and this cannot be handwaved away with a configuration option or a command line switch (even if you personally choose to keep using the old format, you may get a commit with the new style trailer from elsewhere).

Hmm.
Previous: Jonathan NiederNext: Jay Soffian
Message 7 of 13 in “cherry-pick -x: add newline before pick note”
  1. cherry-pick -x: add newline before pick noteMichael J Gruber, Nov 16, 2010
  2. Jeff KingNov 16, 2010
  3. commit -s: allow "(cherry picked " lines in sign-off sectionJonathan Nieder, Nov 16, 2010
  4. Jonathan NiederNov 16, 2010
  5. Junio C HamanoNov 16, 2010
  6. Jonathan NiederNov 16, 2010
  7. Junio C HamanoNov 17, 2010
  8. Jay SoffianNov 17, 2010
  9. Jay SoffianNov 17, 2010
  10. Oswald BuddenhagenMar 8, 2011
  11. Jonathan NiederMar 8, 2011
  12. Oswald BuddenhagenMar 8, 2011
  13. Jonathan NiederMar 8, 2011

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.