Skip to content

Commit 010a0b6

Browse files
ossilatorgitster
authored andcommitted
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 5dcdd74 ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1cc4624 commit 010a0b6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/lib-rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ set_fake_editor () {
6464
fakesha)
6565
test \& != "$action" || action=pick
6666
echo "$action XXXXXXX False commit" >> "$1"
67-
action=pick;;
67+
action=\&;;
6868
*)
6969
sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1"
7070
action=\&;;

0 commit comments

Comments
 (0)