Merge branch 'maint'

diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 46d7d37a51023296033eae2e5576bb36f9c38f7b..49d58e6726836194e7a716365007465056744fc5 100755 (executable)
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -166,7 +166,7 @@ test_expect_success 'prompt - inside bare repository' '
 '
 
 test_expect_success 'prompt - interactive rebase' '
-       printf " (b1|REBASE-i 2/3)" >expected
+       printf " (b1|REBASE-i 2/3)" >expected &&
        write_script fake_editor.sh <<-\EOF &&
                echo "exec echo" >"$1"
                echo "edit $(git log -1 --format="%h")" >>"$1"