Merge 'hv/submodule-config' to 'sb/submodule-helper'

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index fdbc9007d07e8dfe06a7459f40bde69e6bd94bd7..9a96e1566d016e960f79875eb4edba2ffb7c5244 100644 (file)
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -54,6 +54,11 @@ set_fake_editor () {
                        echo '# comment' >> "$1";;
                ">")
                        echo >> "$1";;
+               bad)
+                       action="badcmd";;
+               fakesha)
+                       echo "$action XXXXXXX False commit" >> "$1"
+                       action=pick;;
                *)
                        sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
                        action=pick;;