submodule: add absorb-git-dir function

diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index e9160dfc1d202c08aec032f5a78db098d89d21e0..c525656b2c04f8999482496688a0bd47ae8da9e2 100755 (executable)
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -65,6 +65,13 @@ test_expect_success '--no-empty-directory hides empty directory' '
        test_cmp expected3 output
 '
 
+test_expect_success 'ls-files --others handles non-submodule .git' '
+       mkdir not-a-submodule &&
+       echo foo >not-a-submodule/.git &&
+       git ls-files -o >output &&
+       test_cmp expected1 output
+'
+
 test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' '
        git init super &&
        git init sub &&
@@ -77,7 +84,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 &&