Re: [RFC/PATCH 2/4] revert: refactor code into a do_pick_commit() function

From: Christian Couder <chriscool@tuxfamily.org>
Date: May 30, 2010, 20:29 UTC
Message-ID: <201005302229.46979.chriscool@tuxfamily.org>
In-Reply-To: <AANLkTik6SBEkOICHdMYprzGitfS2hezDXKQ8Q5R8cAYs@mail.gmail.com>

Hi Ram,

On Sunday 30 May 2010 13:19:39 Ramkumar Ramachandra wrote:

> Hi Christian,
> 
> Excellent feature to work on- I've wanted to cherry pick a range several
>  times.

Thanks!

Show 10 quoted lines

> Christian Couder wrote:
> > -static int revert_or_cherry_pick(int argc, const char **argv)
> > +static int do_pick_commit()
> >  {
> >        unsigned char head[20];
> >        struct commit *base, *next, *parent;
> 
> Is there a better way to do this instead of allocating memory for each
> commit? When you cherry pick a lot of commits, it might make sense to
> use a shared memory pool.

I think that most of the time I will cherry pick less than 20 commits so I think the memory usage is not so important. And in any case it could be improved later if there is a real need.

Show 5 quoted lines

> > +       /* this is copied from the shell script, but it's never
> > triggered... */ +       if (action == REVERT && !no_replay)
> > +               die("revert is incompatible with replay");
> 
> If it's here for historical reasons, why don't you remove it now?

Right, I will have a look at removing that.

Thanks, Christian.