Re: [RFC/PATCH 3/4] revert: allow cherry-picking a range of commits

[Christian Couder <chriscool@tuxfamily.org>]

On Sunday 30 May 2010 08:45:52 Christian Couder wrote:
> On Saturday 29 May 2010 17:47:10 Johannes Schindelin wrote:
Hi Dscho,

> Hi Dscho,
> 
> > Hi,
> >
> > On Sat, 29 May 2010, Christian Couder wrote:
> > > diff --git a/builtin/revert.c b/builtin/revert.c
> > > index 70372dc..c281a80 100644
> > > --- a/builtin/revert.c
> > > +++ b/builtin/revert.c
> > > @@ -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;
> >
> > Maybe "--no-merges"?
> 
> I will have a look at it. Thanks!

I decided against using it as it would be incompatible with the -m option to 
revert or cherry-pick a merge.

Thanks,
Christian.