* git cherry could honour "cherry-picked from commit" messages?
@ 2013-10-07 20:16 Adam Spiers
2013-10-07 20:20 ` Adam Spiers
0 siblings, 1 reply; 2+ messages in thread
From: Adam Spiers @ 2013-10-07 20:16 UTC (permalink / raw)
To: git mailing list
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.
Thanks,
Adam
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git cherry could honour "cherry-picked from commit" messages?
2013-10-07 20:16 git cherry could honour "cherry-picked from commit" messages? Adam Spiers
@ 2013-10-07 20:20 ` Adam Spiers
0 siblings, 0 replies; 2+ messages in thread
From: Adam Spiers @ 2013-10-07 20:20 UTC (permalink / raw)
To: git mailing list
On Mon, Oct 07, 2013 at 09:16:17PM +0100, Adam Spiers wrote:
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-07 20:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-07 20:16 git cherry could honour "cherry-picked from commit" messages? Adam Spiers
2013-10-07 20:20 ` Adam Spiers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).