From: Adam Spiers <git@adamspiers.org>
To: git mailing list <git@vger.kernel.org>
Subject: Re: git cherry could honour "cherry-picked from commit" messages?
Date: Mon, 7 Oct 2013 21:20:42 +0100 [thread overview]
Message-ID: <20131007202042.GD31277@pacific.linksys.moosehall> (raw)
In-Reply-To: <20131007201617.GC31277@pacific.linksys.moosehall>
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.
prev parent reply other threads:[~2013-10-07 20:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-07 20:16 git cherry could honour "cherry-picked from commit" messages? Adam Spiers
2013-10-07 20:20 ` Adam Spiers [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131007202042.GD31277@pacific.linksys.moosehall \
--to=git@adamspiers.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).