From: Oswald Buddenhagen Date: Mon, 07 Aug 2023 17:09:34 GMT Subject: [PATCH 2/3] t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently Message-ID: <20230807170935.2336663-3-oswald.buddenhagen@gmx.de> In-Reply-To: <20230807170935.2336663-1-oswald.buddenhagen@gmx.de> Default next action after 'fakesha' to preserving the command instead of forcing 'pick', consistently with other "instant-effect" keywords. There is no reason why one would want that inconsistency, so this was clearly just an oversight in commit 5dcdd740 ("t/lib-rebase: prepare for testing `git rebase --rebase-merges`"). Rectifying it makes the behavior easier to reason about and document. This would affect hypothetical "fakesha " sequences where line already isn't a pick, which currently don't appear. Signed-off-by: Oswald Buddenhagen --- Cc: Phillip Wood --- 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 e6179ab529..9ed87ca7ab 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -64,7 +64,7 @@ set_fake_editor () { fakesha) test \& != "$action" || action=pick echo "$action XXXXXXX False commit" >> "$1" - action=pick;; + action=\&;; *) sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1" action=\&;; -- 2.40.0.152.g15d061e6df