From: Jeff King <peff@peff.net>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: "Ramkumar Ramachandra" <artagnon@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder@ira.uka.de>,
"Christian Couder" <christian.couder@gmail.com>,
"Christian Couder" <chriscool@tuxfamily.org>,
git@vger.kernel.org
Subject: Re: [BUG] multi-commit cherry-pick messes up the order of commits
Date: Thu, 12 Jan 2012 15:17:10 -0500 [thread overview]
Message-ID: <20120112201710.GA31427@sigill.intra.peff.net> (raw)
In-Reply-To: <20120112201122.GE6038@burratino>
On Thu, Jan 12, 2012 at 02:11:22PM -0600, Jonathan Nieder wrote:
> > I am tempted to suggest
> [...]
> > That would make all of these work as most people would
> > expect:
> >
> > git cherry-pick A B C
> > git cherry-pick A..B
> > git cherry-pick A..B B..C
> >
> > but would be a regression for:
> >
> > git cherry-pick B ^A
> >
> > versus the current code. I suspect that the latter form is not all that
> > commonly used, though, and certainly I would accept it as a casualty of
> > making the "A B C" form work. My only hesitation is that it is in fact a
> > regression.
>
> I find myself using such complicated expressions as
>
> list-revs-to-skip |
> xargs git cherry-pick --cherry-pick --right-only HEAD...topic --not
>
> so yeah, that would be a pretty serious loss in functionality.
That's gross. :)
But thank you for providing a real-world example. I had a vague notion
that the full power of the revision parser was not actually useful to
people, but clearly not.
OTOH, if cherry-pick were more simplistic, you could perhaps get by
with:
list-revs-to-skip |
xargs git rev-list --cherry-pick --right-only HEAD...topic --not |
git cherry-pick --stdin
-Peff
next prev parent reply other threads:[~2012-01-12 20:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 17:31 [BUG] multi-commit cherry-pick messes up the order of commits SZEDER Gábor
2012-01-12 13:31 ` Christian Couder
2012-01-12 14:44 ` SZEDER Gábor
2012-01-12 16:35 ` Ramkumar Ramachandra
2012-01-12 16:53 ` Jeff King
2012-01-12 17:09 ` Ramkumar Ramachandra
2012-01-12 17:14 ` Ramkumar Ramachandra
2012-01-12 17:15 ` Jeff King
2012-01-12 17:26 ` Ramkumar Ramachandra
2012-01-12 17:50 ` [PATCH] cherry-pick: add failing test for out-of-order pick Ramkumar Ramachandra
2012-01-12 18:32 ` Jonathan Nieder
2012-01-12 19:05 ` [PATCH v2] " Ramkumar Ramachandra
2012-01-12 19:33 ` Jonathan Nieder
2012-01-12 18:25 ` [BUG] multi-commit cherry-pick messes up the order of commits Junio C Hamano
2012-01-12 19:25 ` Ramkumar Ramachandra
2012-01-12 19:47 ` Jeff King
2012-01-12 20:11 ` Jonathan Nieder
2012-01-12 20:17 ` Jeff King [this message]
2012-01-12 20:11 ` Junio C Hamano
2012-01-12 19:21 ` Johannes Sixt
2012-01-12 19:29 ` Ramkumar Ramachandra
2012-01-12 19:34 ` Jonathan Nieder
2012-01-12 17:47 ` Jonathan Nieder
2012-01-12 18:41 ` Junio C Hamano
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=20120112201710.GA31427@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=artagnon@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=szeder@ira.uka.de \
/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).