Alex Henrie <alexhenrie24@xxxxxxxxx> writes: > Before the todo list is edited it is rewritten to shorten the OIDs of > the commits being picked and to append advice about editing the list. > The exact advice depends on whether the todo list is being edited for > the first time or not. After the todo list has been edited it is > rewritten to lengthen the OIDs of the commits being picked and to remove > the advice. If the edited list cannot be parsed then this last step is > skipped. > > Prior to db81e50724 (rebase-interactive: use todo_list_write_to_file() > in edit_todo_list(), 2019-03-05) if the existing todo list could not be > parsed then the initial rewrite was skipped as well. This had the > unfortunate consequence that if the list could not be parsed after the > initial edit the advice given to the user was wrong when they re-edited > the list. This change relied on todo_list_parse_insn_buffer() returning > the whole todo list even when it cannot be parsed. Unfortunately if the > list starts with a "fixup" command then it will be truncated and the > remaining lines are lost. Fix this by continuing to parse after an > initial "fixup" commit as we do when we see any other invalid line. > > Signed-off-by: Alex Henrie <alexhenrie24@xxxxxxxxx> > --- > sequencer.c | 2 +- > t/t3404-rebase-interactive.sh | 27 +++++++++++++++++++++++++++ > 2 files changed, 28 insertions(+), 1 deletion(-) Very cleanly explained. Thanks for an update. > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh > index ff0afad63e..c734983da0 100755 > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -1596,6 +1596,33 @@ test_expect_success 'static check of bad command' ' > test C = $(git cat-file commit HEAD^ | sed -ne \$p) > ' > > +test_expect_success 'the first command cannot be a fixup' ' > + rebase_setup_and_clean fixup-first && > + ( > + cat >orig <<-EOF && > + fixup $(git log -1 --format="%h %s" B) > + pick $(git log -1 --format="%h %s" C) > + EOF > + > + ( > + set_replace_editor orig && > + test_must_fail git rebase -i A 2>actual > + ) && > + grep "cannot .fixup. without a previous commit" actual && > + grep "You can fix this with .git rebase --edit-todo.." actual && > + # verify that the todo list has not been truncated > + grep -v "^#" .git/rebase-merge/git-rebase-todo >actual && > + test_cmp orig actual && > + > + test_must_fail git rebase --edit-todo 2>actual && > + grep "cannot .fixup. without a previous commit" actual && > + grep "You can fix this with .git rebase --edit-todo.." actual && > + # verify that the todo list has not been truncated > + grep -v "^#" .git/rebase-merge/git-rebase-todo >actual && > + test_cmp orig actual > + ) > +' The structure of this new test piece, including the use of "log -1 --format", seems to follow existing tests, and very readable. Why do we have one extra level of subshell, though? There is no "cd" that may affect the later test pieces, and set_something_editor that touches environment that may affect the later test pieces is called in its own subshell already. Other than that, looking good (there may be a valid reason why the test piece needs the subshell around it, but it was just not apparent to me). > test_expect_success 'tabs and spaces are accepted in the todolist' ' > rebase_setup_and_clean indented-comment && > write_script add-indent.sh <<-\EOF &&
