Re: [PATCH 1/3] t/lib-rebase: set_fake_editor(): fix recognition of reset's short command
From: Junio C Hamano <hidden>
Date: 2023-08-07 19:01:16
Oswald Buddenhagen [off-list ref] 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.
quoted hunk
Signed-off-by: Oswald Buddenhagen <redacted> --- Cc: Phillip Wood <redacted> --- 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";;