From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Date: Mon, 7 Aug 2023 17:09:34 +0000 (+0200)
Subject: t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently
X-Git-Tag: v2.43.0-rc0~138^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=010a0b62e0899851c9f7080988b5d0adb3a9bc0c;p=thirdparty%2Fgit.git

t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently

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 <n>" sequences where line <n>
already isn't a pick, which currently don't appear.

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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=\&;;