Hi Junio,
Le 29/01/2019 à 21:14, Junio C Hamano a écrit :
> Alban Gruin <alban.gruin@xxxxxxxxx> writes:
>
>> if (opts->allow_ff && skip_unnecessary_picks(r, &oid))
>> return error(_("could not skip unnecessary pick commands"));
>>
>> if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head))
>> return -1;
>> -;
>> +
>> if (require_clean_work_tree(r, "rebase", "", 1, 1))
>> return -1;
>
> This hunk was fishy (in my tree, there is no such line with ';'
> alone, as I believe that we've already fixed it) and made me spend
> some time to figure out why the patch does not apply, but once the
> cause was known it was trivial to fix.
>
Indeed, this semicolon was removed by 29d51e214c ("sequencer.c: remove a
stray semicolon", 2018-11-03). But this commit isn’t part of nd/the-index.
> I've looked at the difference since the previous version, but in
> essence, the only change I saw was that four instances of similar
> expressions are replaced with calls to a new todo_item_get_arg()
> helper and no other changes.
>
> Thanks, will replace.
>
Cheers,
Alban
