diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-08-07 19:09:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-07 12:09:34 -0700 |
| commit | 010a0b62e0899851c9f7080988b5d0adb3a9bc0c (patch) | |
| tree | 2cd2983189a6bf86a9c094f3b9dc598ea6e16dd6 /t/lib-rebase.sh | |
| parent | 1cc462446e2f12fd58449845d1a3029d8cc81921 (diff) | |
| download | git-010a0b62e0899851c9f7080988b5d0adb3a9bc0c.tar.gz | |
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>
Diffstat (limited to 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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=\&;; |