From: Junio C Hamano <gitster@pobox.com>
To: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Cc: git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH 1/3] t/lib-rebase: set_fake_editor(): fix recognition of reset's short command
Date: Mon, 07 Aug 2023 12:00:56 -0700 [thread overview]
Message-ID: <xmqq7cq6fziv.fsf@gitster.g> (raw)
In-Reply-To: <20230807170935.2336663-2-oswald.buddenhagen@gmx.de> (Oswald Buddenhagen's message of "Mon, 7 Aug 2023 19:09:33 +0200")
Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes:
> ... in FAKE_LINES.
>
> This has been broken ever since it was introduced in 5dcdd7409a
> (t/lib-rebase: prepare for testing `git rebase --rebase-merges`,
> 2019-07-31), but it's not actually used, so it's a cosmetic defect
> only.
Sharp eyes. And this makes the list match what is actually used and
defined in sequencer.c which is good.
Thanks.
>
> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
> ---
> Cc: Phillip Wood <phillip.wood123@gmail.com>
> ---
> t/lib-rebase.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
> index 7ca5b918f0..e6179ab529 100644
> --- a/t/lib-rebase.sh
> +++ b/t/lib-rebase.sh
> @@ -49,7 +49,7 @@ set_fake_editor () {
> action=\&
> for line in $FAKE_LINES; do
> case $line in
> - pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m)
> + pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|t|merge|m)
> action="$line";;
> exec_*|x_*|break|b)
> echo "$line" | sed 's/_/ /g' >> "$1";;
next prev parent reply other threads:[~2023-08-07 19:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 16:22 [PATCH] t/lib-rebase: (mostly) cosmetic improvements to set_fake_editor() Oswald Buddenhagen
2023-04-26 15:45 ` Oswald Buddenhagen
2023-04-26 17:24 ` Junio C Hamano
2023-05-02 16:38 ` Felipe Contreras
2023-05-17 9:23 ` Phillip Wood
2023-08-07 17:09 ` [PATCH 0/3] " Oswald Buddenhagen
2023-08-07 17:09 ` [PATCH 1/3] t/lib-rebase: set_fake_editor(): fix recognition of reset's short command Oswald Buddenhagen
2023-08-07 19:00 ` Junio C Hamano [this message]
2023-08-07 17:09 ` [PATCH 2/3] t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently Oswald Buddenhagen
2023-08-07 19:09 ` Junio C Hamano
2023-08-07 17:09 ` [PATCH 3/3] t/lib-rebase: improve documentation of set_fake_editor() Oswald Buddenhagen
2023-08-09 13:04 ` Phillip Wood
2023-08-09 17:15 ` [PATCH v2 0/1] t/lib-rebase: (mostly) cosmetic improvements to set_fake_editor() Oswald Buddenhagen
2023-08-09 17:15 ` [PATCH v2 1/1] t/lib-rebase: improve documentation of set_fake_editor() Oswald Buddenhagen
2023-08-09 19:38 ` Junio C Hamano
2023-08-10 14:37 ` Phillip Wood
2023-08-10 15:49 ` Junio C Hamano
2023-08-09 21:15 ` [PATCH v2 0/1] t/lib-rebase: (mostly) cosmetic improvements to set_fake_editor() Junio C Hamano
2023-08-10 10:42 ` Oswald Buddenhagen
2023-08-10 16:00 ` Junio C Hamano
2023-08-10 23:57 ` Junio C Hamano
2023-08-09 13:05 ` [PATCH 0/3] " Phillip Wood
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=xmqq7cq6fziv.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=oswald.buddenhagen@gmx.de \
--cc=phillip.wood123@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.