Re: 2.6.0: Comment in rebase instruction has become too rigid

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sep 29, 2015, 17:01 UTC
Message-ID: <vpqzj0588i2.fsf@grenoble-inp.fr>
In-Reply-To: <vpqr3lhb719.fsf@grenoble-inp.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Show 24 quoted lines

> Nazri Ramliy <ayiehere@gmail.com> writes:
>
>> I'd hit that key in my editor that filters the pick instructions add
>> inserts the list of the modified files in each commit so that the
>> instruction sheet becomes like this:
>>
>>   pick deadbeef some commit message
>>      # M path/to/foo.txt | 15 ++++----------
>>   pick cafebabe another commit message
>>      # M bar.txt | 2 +-
>>
>>
>> IIRC before git 2.6.0 this worked fine.
>
> Confirmed: Git 2.1.4 accepts this, 2.6 doesn't:
>
> Warning: the command isn't recognized in the following line:
>  - # pick dbafac11052a0075233bdcf0b71f54d1503aa82d test
>
> You can fix this with 'git rebase --edit-todo'.
> Or you can abort the rebase with 'git rebase --abort'.
>
> I didn't bisect, but I guess this was introduced in the series
> introducing this check on the todolist before starting the bisection.

Indeed:

804098bb30a5339cccb0be981a3e876245aa0ae5 is the first bad commit
commit 804098bb30a5339cccb0be981a3e876245aa0ae5
Author: Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date:   Mon Jun 29 22:20:32 2015 +0200

    git rebase -i: add static check for commands and SHA-1
    
    Check before the start of the rebasing if the commands exists, and for
    the commands expecting a SHA-1, check if the SHA-1 is present and
    corresponds to a commit. In case of error, print the error, stop git
    rebase and prompt the user to fix with 'git rebase --edit-todo' or to
    abort.
    
    This allows to avoid doing half of a rebase before finding an error
    and giving back what's left of the todo list to the user and prompt
    him to fix when it might be too late for him to do so (he might have
    to abort and restart the rebase).
    
    Signed-off-by: Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

:100644 100644 c26a200a6c0e7edd2b182b71af50df52179d295f dcc3401b5a8c45fd9c5ba474416eb4a6c3c9a29e M git-rebase--interactive.sh :040000 040000 3a2882c656f4a2ea3cfcba7e5afca79877c61295 522781ff8b31d55b76064d27f3d4326026721091 M t

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/