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

Re: git cherry could honour "cherry-picked from commit" messages?

From
Adam Spiers <git@adamspiers.org>
Date
Oct 7, 2013, 20:20 UTC
Message-ID
<20131007202042.GD31277@pacific.linksys.moosehall>
In-Reply-To
<20131007201617.GC31277@pacific.linksys.moosehall>
On Mon, Oct 07, 2013 at 09:16:17PM +0100, Adam Spiers wrote:
Show 12 quoted lines
> Currently git cherry determines whether a commit has been merged
> upstream by calculating its patch-id and looking for that in the
> upstream branch.  Is there any reason why it couldn't also look for
> "(cherry picked from commit ...)" lines which are automatically added
> by cherry-pick's -x switch?  This would combat the blind spot in
> cherry's current approach concerning the case where the patch-id is
> changed by the cherry-picking process (e.g. when the diff context
> changes).
> 
> Most likely there would be good reasons to make such behaviour
> optional (e.g. via git-config), but it seems like a waste for cherry
> to complete ignore these lines which provide useful information.

Also, whether or not this approach works, it would also be useful to introduce a config option for cherry-pick so that it adds the "(cherry picked from commit ...)" lines by default. When introducing this config option, another command-line switch would be required to allow users to negate it.

Previous: Adam Spiers
Message 2 of 2 in “git cherry could honour "cherry-picked from commit" messages?”
  1. Adam SpiersOct 7, 2013
  2. Adam SpiersOct 7, 2013

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.