From: Phillip Wood <phillip.wood123@gmail.com>
To: Alex Henrie <alexhenrie24@gmail.com>,
git@vger.kernel.org, alban.gruin@gmail.com, gitster@pobox.com,
phillip.wood@dunelm.org.uk
Subject: Re: [PATCH v4 0/1] sequencer: finish parsing the todo list despite an invalid first line
Date: Fri, 21 Jul 2023 14:13:09 +0100 [thread overview]
Message-ID: <8e38a723-9fda-2d76-c767-7b76cb428a73@gmail.com> (raw)
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
> 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 &&
next prev parent reply other threads:[~2023-07-21 13:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 14:43 [PATCH] sequencer: finish parsing the todo list despite an invalid first line Alex Henrie
2023-07-19 21:32 ` Junio C Hamano
2023-07-20 9:42 ` Phillip Wood
2023-07-20 22:37 ` Alex Henrie
2023-07-21 9:31 ` Phillip Wood
2023-07-21 13:08 ` Phillip Wood
2023-07-21 15:21 ` Junio C Hamano
2023-07-21 5:38 ` [PATCH v2 0/1] " Alex Henrie
2023-07-21 5:38 ` [PATCH v2 1/1] " Alex Henrie
2023-07-21 5:58 ` [PATCH v3 0/1] " Alex Henrie
2023-07-21 5:58 ` [PATCH v3 1/1] " Alex Henrie
2023-07-21 6:07 ` [PATCH v4 0/1] " Alex Henrie
2023-07-21 6:07 ` [PATCH v4 1/1] " Alex Henrie
2023-07-21 13:13 ` Phillip Wood [this message]
2023-07-22 21:28 ` [PATCH v5 0/1] " Alex Henrie
2023-07-22 21:28 ` [PATCH v5 1/1] " Alex Henrie
2023-07-24 10:02 ` Phillip Wood
2023-07-24 15:26 ` Alex Henrie
2023-07-24 16:00 ` Phillip Wood
2023-07-24 16:40 ` Junio C Hamano
2023-07-24 17:39 ` Alex Henrie
2023-07-24 18:30 ` Junio C Hamano
2023-07-24 20:08 ` Alex Henrie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8e38a723-9fda-2d76-c767-7b76cb428a73@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=alban.gruin@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).