mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2023-08-07 19:09:34 +02:00
committed by Junio C Hamano
parent 1cc462446e
commit 010a0b62e0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/lib-rebase.sh
View File

@ -64,7 +64,7 @@ set_fake_editor () {
fakesha) fakesha)
test \& != "$action" || action=pick test \& != "$action" || action=pick
echo "$action XXXXXXX False commit" >> "$1" echo "$action XXXXXXX False commit" >> "$1"
action=pick;; action=\&;;
*) *)
sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1" sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1"
action=\&;; action=\&;;