Merge branch 'jk/format-patch-from' into maint

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index b192f936bcbe794f0691550d1bf38714b1359d01..f0b33053ab01c692a4dda15c0f631aaa45fb81b9 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -58,7 +58,7 @@ test_expect_success 'setup a submodule tree' '
         git submodule add ../merging merging &&
         test_tick &&
         git commit -m "rebasing"
-       )
+       ) &&
        (cd super &&
         git submodule add ../none none &&
         test_tick &&