Merge branch 'mg/replace-resolve-delete'

diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index e9160dfc1d202c08aec032f5a78db098d89d21e0..88be904c09214586b18f867306f7a8dcf1170cb7 100755 (executable)
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -77,7 +77,7 @@ test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' '
        ) &&
        (
                cd super &&
-               "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub
+               "$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub
                git ls-files --others --exclude-standard >../actual
        ) &&
        echo sub/ >expect &&