Re: [PATCH v5 08/10] rebase -i: skip unnecessary picks using the rebase--helper
- From
Liam Beguin <liambeguin@gmail.com>
- Date
- Jun 17, 2017, 22:48 UTC
- Message-ID
- <529f6cc7-ab2b-72bb-bc51-f4cca4e98652@gmail.com>
- In-Reply-To
- <alpine.DEB.2.21.1.1706161551030.4200@virtualbox>
Hi Johannes,
On 16/06/17 09:56 AM, Johannes Schindelin wrote:
Show 34 quoted lines
> 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.Is there any chance of this moving forward? I was hoping to resend my path to abbreviate command names on top of this.
> > Ciao, > Dscho >
Thanks,
- Liam