t/lib-rebase: prepare for testing `git rebase --rebase-merges`

The format of the todo list is quite a bit different in the
`--rebase-merges` mode; Let's prepare the fake editor to handle those
todo lists properly, too.

The original idea was that we keep the original command unless
overridden, and because the original todo lists only had `pick` lines
anyway, we could be sloppy and "override" the command by the same
command (i.e. use the sed replacement pattern "pick" instead of "&").

This actually would not have worked with `fixup` and `squash` commands,
but it would appear that we never tried to use the fake editor with
`--autosquash`.

However, in the next commit we want to use the fake editor in
conjunction with `--rebase-merges`, so let's use the correct sed
replacement pattern.

Technically, it is not necessary to take care of the `fakesha` thing
(where we reuse the sed replacement pattern to craft a new todo
command), at least for now, as the only user of that thing overrides the
`action` anyway. Nevertheless, for completeness' sake, we do take care
of it.

Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 7ea30e50068be8f892a289c8bf705d8096a27ec3..6d87961e419e10257b3f619d42004bae0a35d7cf 100644 (file)
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -44,10 +44,10 @@ set_fake_editor () {
        rm -f "$1"
        echo 'rebase -i script before editing:'
        cat "$1".tmp
-       action=pick
+       action=\&
        for line in $FAKE_LINES; do
                case $line in
-               pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d)
+               pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m)
                        action="$line";;
                exec_*|x_*|break|b)
                        echo "$line" | sed 's/_/ /g' >> "$1";;
@@ -58,11 +58,12 @@ set_fake_editor () {
                bad)
                        action="badcmd";;
                fakesha)
+                       test \& != "$action" || action=pick
                        echo "$action XXXXXXX False commit" >> "$1"
                        action=pick;;
                *)
-                       sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
-                       action=pick;;
+                       sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1"
+                       action=\&;;
                esac
        done
        echo 'rebase -i script after editing:'