git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Sverre Rabbelier <srabbelier@gmail.com>
Subject: Re: [RFC/PATCH 3/4] revert: allow cherry-picking a range of commits
Date: Sun, 30 May 2010 08:41:15 +0200	[thread overview]
Message-ID: <201005300841.15606.chriscool@tuxfamily.org> (raw)
In-Reply-To: <7vmxvi4tkq.fsf@alter.siamese.dyndns.org>

On Saturday 29 May 2010 17:27:01 Junio C Hamano wrote:
> Christian Couder <chriscool@tuxfamily.org> writes:
> > This makes it possible to pass a range of commits like A..B
> > to "git cherry-pick" and to "git revert" to process many
> > commits instead of just one.
> >
> > @@ -545,6 +542,40 @@ static int revert_or_cherry_pick(int argc, const
> > char **argv) if (read_cache() < 0)
> >  		die("git %s: failed to read the index", me);
> >
> > +	dotdot = strstr(commit_name, "..");
> > +	if (dotdot) {
> > +		struct rev_info revs;
> > +		const char *argv[4];
> > +		int argc = 0;
> > +
> > +		argv[argc++] = NULL;
> > +		if (action != REVERT)
> > +			argv[argc++] = "--reverse";
> > +		argv[argc++] = commit_name;
> > +		argv[argc++] = NULL;
> > +
> > +		init_revisions(&revs, NULL);
> 
> The goal of the series is a worthy one, but I would imagine people would
> want to run these while on "maint":
> 
>     git cherry-pick master~2..master
>     git cherry-pick master^ master
> 
> or even
> 
>     git cherry-pick -2 master
> 
> How about enumerating the commits with an equivalent of
> 
>     git rev-list --no-walk "$@"
> 
> as an alternative implementation?

I agree that it would be nice, but I am not sure it would allow using "-2 
master" as arguments because "--no-walk" seems to take over "-2": 

$ git rev-list --no-walk -2 master
81fa024cd8e336ba257f13fe7724b95baacfa3ad
$

> The current behaviour would fall out just as a natural special case
> because
> 
>     git rev-list --no-walk $commit == $commit
> 
> Hmm?

Yes, I will provide an updated patch series using the equivalent of '--no-walk 
"$@"' but arguments like "-2 master" will not work.

Thanks,
Christian.


 

  reply	other threads:[~2010-05-30  6:44 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-29  4:40 [RFC/PATCH 0/4] implement "git cherry-pick A..B" Christian Couder
2010-05-29  4:40 ` [RFC/PATCH 1/4] revert: use run_command_v_opt() instead of execv_git_cmd() Christian Couder
2010-05-29  4:40 ` [RFC/PATCH 2/4] revert: refactor code into a do_pick_commit() function Christian Couder
2010-05-30 11:19   ` Ramkumar Ramachandra
2010-05-30 20:07     ` Jonathan Nieder
2010-05-30 20:29     ` Christian Couder
2010-05-29  4:40 ` [RFC/PATCH 3/4] revert: allow cherry-picking a range of commits Christian Couder
2010-05-29 15:27   ` Junio C Hamano
2010-05-30  6:41     ` Christian Couder [this message]
2010-05-29 15:47   ` Johannes Schindelin
2010-05-30  6:45     ` Christian Couder
2010-06-01  3:12       ` Christian Couder
2010-05-29  4:40 ` [RFC/PATCH 4/4] revert: add tests to check " Christian Couder
2010-05-29 13:12 ` [RFC/PATCH 0/4] implement "git cherry-pick A..B" Sverre Rabbelier
2010-05-30  7:41   ` Christian Couder

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=201005300841.15606.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=srabbelier@gmail.com \
    /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).