Re: [PATCH v4 0/1] sequencer: finish parsing the todo list despite an invalid first line
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Jul 21, 2023, 13:13 UTC
- Message-ID
- <8e38a723-9fda-2d76-c767-7b76cb428a73@gmail.com>
- In-Reply-To
- <20230721060848.35641-1-alexhenrie24@gmail.com>
On 21/07/2023 07:07, Alex Henrie wrote:
> Changes from v3: > - Rebase onto HEAD~4 instead of --root (which was the original motivation > for sending a new patch and I forgot to include that change; I probably > shouldn't be doing Git development late at night...)
Please don't feel that you have to re-roll straight away when someone reviews your patch - it's fine to wait a while if you're busy. Also if you disagree with some of the reviewer's comments it can be helpful to wait for them to respond before sending a new version in order to try and reach a consensus about the best way forward.
Best Wishes
Phillip
Show 20 quoted lines
> Alex Henrie (1): > sequencer: finish parsing the todo list despite an invalid first line > > sequencer.c | 2 +- > t/t3404-rebase-interactive.sh | 18 ++++++++++++++++++ > 2 files changed, 19 insertions(+), 1 deletion(-) > > Range-diff against v3: > 1: b1af2df3f5 ! 1: f6fcdcd9a9 sequencer: finish parsing the todo list despite an invalid first line > @@ t/t3404-rebase-interactive.sh: test_expect_success 'static check of bad command' > + rebase_setup_and_clean fixup-first && > + ( > + set_fake_editor && > -+ test_must_fail env FAKE_LINES="fixup 1 2 3 4 5" \ > -+ git rebase -i --root 2>actual && > ++ test_must_fail env FAKE_LINES="fixup 1 2 3 4" \ > ++ git rebase -i HEAD~4 2>actual && > + grep "cannot .fixup. without a previous commit" actual && > + grep "You can fix this with .git rebase --edit-todo.." actual && > + grep -v "^#" .git/rebase-merge/git-rebase-todo >orig &&