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

Re: Tracking cherry picks

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Oct 21, 2011, 09:52 UTC
Message-ID
<20111021095234.GA17219@elie.hsd1.il.comcast.net>
In-Reply-To
<4EA02E6C.2040608@cfl.rr.com>
Hi,
Phillip Susi wrote:
Show 6 quoted lines
> Sometimes a bug is found and the fix needs applied to multiple
> branches.  I would like to be able to list what branches the fix has been
> applied to to validate that it went in everywhere it was needed, but after
> cherry-picking the fix from master to the stable branches, the SHA1 of the
> commit is different, and so git branch --contains does not think the commit
> was applied to each of the stable branches.

If you base the fix on the oldest commit you think you might ever want to apply it to, then you can reuse the same bugfix commit in all branches. See gitworkflows(7) for more on this.

Hope that helps, and good luck, Jonathan

Previous: Ramkumar Ramachandra
Message 4 of 4 in “Tracking cherry picks”
  1. Phillip SusiOct 20, 2011
  2. Kirill LikhodedovOct 20, 2011
  3. Ramkumar RamachandraOct 20, 2011
  4. Jonathan NiederOct 21, 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.