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
Jonathan Nieder <jrnieder@gmail.com>
Date
Nov 16, 2010, 23:36 UTC
Message-ID
<20101116233649.GA30700@burratino>
In-Reply-To
<7vlj4shoej.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
Show 18 quoted lines
> I am not sure I agree with the reasoning of this patch, by the way.  A
> cherry-pick is an event that breaks the life of the patch, so it may even
> be a sensible thing to do to express "the above sign-off chain shows who
> were involved in the original commit; I am cherry-picking it out of
> context, and these people do not have much to do with the result" with a
> blank line on both sides of the "cherry picked" line, like this:
> 
>	A concise summary of the change
> 
> 	A detailed description of the change, why it is needed, what
>	was broken and why applying this is the best course of action.
> 
> 	Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 	Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> 
> 	(cherry picked from commit 9d8117e72bf453dd9d85e0cd322ce4a0f8bccbc0)
> 
> 	Signed-off-by: Back Porter <backporter@example.com>

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.)

Previous: Junio C HamanoNext: Junio C Hamano
Message 6 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.