]> git.ipfire.org Git - thirdparty/git.git/commit
t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Mon, 7 Aug 2023 17:09:34 +0000 (19:09 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Aug 2023 19:09:34 +0000 (12:09 -0700)
commit010a0b62e0899851c9f7080988b5d0adb3a9bc0c
tree2cd2983189a6bf86a9c094f3b9dc598ea6e16dd6
parent1cc462446e2f12fd58449845d1a3029d8cc81921
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>
t/lib-rebase.sh