rebase -i: fix parsing of "fixup -C<commit>"

[thirdparty/git.git] / t / lib-rebase.sh

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index b57541356bd03d139334a144339b01a92be2c70a..7ca5b918f0445cbb3097e531883861f5574e29a1 100644 (file)
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -60,7 +60,7 @@ set_fake_editor () {
                ">")
                        echo >> "$1";;
                bad)
-                       action="badcmd";;
+                       action="pickled";;
                fakesha)
                        test \& != "$action" || action=pick
                        echo "$action XXXXXXX False commit" >> "$1"
@@ -211,6 +211,9 @@ check_reworded_commits () {
 # usage: set_replace_editor <file>
 #
 # Replace the todo file with the exact contents of the given file.
+# N.B. sets GIT_SEQUENCE_EDITOR rather than EDITOR so it can be
+# combined with set_fake_editor to reword commits and replace the
+# todo list
 set_replace_editor () {
        cat >script <<-\EOF &&
        cat FILENAME >"$1"
@@ -219,6 +222,7 @@ set_replace_editor () {
        cat "$1"
        EOF
 
-       sed -e "s/FILENAME/$1/g" <script | write_script fake-editor.sh &&
-       test_set_editor "$(pwd)/fake-editor.sh"
+       sed -e "s/FILENAME/$1/g" script |
+               write_script fake-sequence-editor.sh &&
+       test_set_sequence_editor "$(pwd)/fake-sequence-editor.sh"
 }