Sync with maint

diff --git a/t/t3050-subprojects-fetch.sh b/t/t3050-subprojects-fetch.sh
index 2b21b1070d6b8f864aee0049d5cb2dccef0daa46..2f5f41a012b5f6e38f2b9d631a99648ac8937c2d 100755 (executable)
--- a/t/t3050-subprojects-fetch.sh
+++ b/t/t3050-subprojects-fetch.sh
@@ -10,17 +10,17 @@ test_expect_success setup '
                cd sub &&
                git init &&
                >subfile &&
-               git add subfile
+               git add subfile &&
                git commit -m "subproject commit #1"
        ) &&
-       >mainfile
+       >mainfile &&
        git add sub mainfile &&
        test_tick &&
        git commit -m "superproject commit #1"
 '
 
 test_expect_success clone '
-       git clone file://`pwd`/.git cloned &&
+       git clone "file://$(pwd)/.git" cloned &&
        (git rev-parse HEAD; git ls-files -s) >expected &&
        (
                cd cloned &&