Re: [PATCH v5 08/10] rebase -i: skip unnecessary picks using the rebase--helper

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi Liam,

On Thu, 15 Jun 2017, Liam Beguin wrote:

> On 14/06/17 09:08 AM, Johannes Schindelin wrote:
> > diff --git a/sequencer.c b/sequencer.c
> > index a697906d463..a0e020dab09 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -2640,3 +2640,110 @@ int check_todo_list(void)
> >  
> >  	return res;
> >  }
> > +
> > +/* skip picking commits whose parents are unchanged */
> > +int skip_unnecessary_picks(void)
> > +{
> > +	const char *todo_file = rebase_path_todo();
> > +	struct strbuf buf = STRBUF_INIT;
> > +	struct todo_list todo_list = TODO_LIST_INIT;
> > +	struct object_id onto_oid, *oid = &onto_oid, *parent_oid;
> > +	int fd, i;
> > +
> > +	if (!read_oneliner(&buf, rebase_path_onto(), 0))
> > +		return error(_("could not read 'onto'"));
> > +	if (get_sha1(buf.buf, onto_oid.hash)) {
> 
> I missed this last time but we could also replace `get_sha1` with `get_oid`

Good point!

I replaced this locally and force-pushed, but there is actually little
chance of this patch series being integrated in a form with which I would
be comfortable.

Ciao,
Dscho