git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yann Dirson <dirson@bertin.fr>
To: git list <git@vger.kernel.org>
Cc: "Carlos Martín Nieto" <cmn@elego.de>
Subject: Re: [BUG] cherry-pick ignores some arguments
Date: Fri, 15 Jun 2012 09:14:25 +0200	[thread overview]
Message-ID: <20120615091425.20e40af9@chalon.bertin.fr> (raw)
In-Reply-To: <1339691389.4625.9.camel@beez.lab.cmartin.tk>

On Thu, 14 Jun 2012 18:29:49 +0200 Carlos Martín Nieto <cmn@elego.de> wrote:
> On Thu, 2012-06-14 at 11:44 +0200, Yann Dirson wrote:
> > Hello list,
> > 
> > I just did a "git cherry-pick AAA BBB..CCC" using 1.7.10.3, and was surprised
> > that only the BBB..CCC range got picked - AAA was silently ignored.
> > 
> 
> There is no way to know whether this is a bug without knowing how AAA,
> BBB and ccc are related? From the names, can we assume that AAA is a
> (grand)parent of BBB? If that is the case, cherry-pick is behaving as
> expected.
>
> See the DESCRIPTION in http://git-scm.com/docs/git-rev-list for further
> explanation, but the short of the story is that the second argument told
> it to ignore any commit before BBB, so AAA is not in the list of commits
> to be applied.

OK, this is exactly the case.  Looking back at the cherry-pick manpage, I'd say that
what confused me is the implicit --no-walk: the standard "git cherry-pick AAA" does
not look like a rev-list spec at all!

At least for this command, it would seem more natural (to me at least) to take
each arg one by one and feed it to "rev-list --no-walk" or similar.  Maybe some
special rev-list flag could trigger such a particular behaviour, pretty much like
what --no-walk does ?


Another orthogonal UI issue I see, is that rev-list could be more user-friendly to warn
the user when one element of a rev list is ignored because of another one.  Not sure
whether this would be useful for all explicit rev lists specified by the user - maybe a
config var and associated option would be needed too.

-- 
Yann Dirson - Bertin Technologies

  reply	other threads:[~2012-06-15  7:14 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-14  9:44 [BUG] cherry-pick ignores some arguments Yann Dirson
2012-06-14 16:29 ` Carlos Martín Nieto
2012-06-15  7:14   ` Yann Dirson [this message]
2012-06-15 13:12     ` Carlos Martín Nieto
2012-06-15 14:33       ` [PATCH 1/2] Documentation: --no-walk is no-op if range is specified Carlos Martín Nieto
2012-06-15 14:33         ` [PATCH 2/2] git-cherry-pick.txt: make clearer when revision walking gets activated Carlos Martín Nieto
2012-06-15 17:52           ` Junio C Hamano
2012-06-15 17:37         ` [PATCH 1/2] Documentation: --no-walk is no-op if range is specified Junio C Hamano
2012-06-15 14:39       ` [BUG] cherry-pick ignores some arguments Carlos Martín Nieto
2012-06-15 15:06     ` Junio C Hamano
2012-06-15 15:03   ` 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=20120615091425.20e40af9@chalon.bertin.fr \
    --to=dirson@bertin.fr \
    --cc=cmn@elego.de \
    --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).