]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer: remove overzealous assumption in rebase -i mode
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 21 Oct 2016 12:26:13 +0000 (14:26 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2016 16:32:35 +0000 (09:32 -0700)
commit2eeaf1b36becceef56dbe44a2de6b108c3e072ff
tree3487959ffb2c110adf09498b51fa862b3f0dd7a6
parentf56fffef9a36b46a1ab2f377c2dd84701e36855a
sequencer: remove overzealous assumption in rebase -i mode

The sequencer was introduced to make the cherry-pick and revert
functionality available as library function, with the original idea
being to extend the sequencer to also implement the rebase -i
functionality.

The test to ensure that all of the commands in the script are identical
to the overall operation does not mesh well with that.

Therefore let's disable the test in rebase -i mode.

While at it, error out early if the "instruction sheet" (i.e. the todo
script) could not be parsed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c