Merge branch 'jk/oi-delta-base'

diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 2eec0118c4235c0aa9d85cb7112e1f72b49c5c5f..88be904c09214586b18f867306f7a8dcf1170cb7 100755 (executable)
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -65,4 +65,23 @@ test_expect_success '--no-empty-directory hides empty directory' '
        test_cmp expected3 output
 '
 
+test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' '
+       git init super &&
+       git init sub &&
+       (
+               cd sub &&
+               >a &&
+               git add a &&
+               git commit -m sub &&
+               git pack-refs --all
+       ) &&
+       (
+               cd super &&
+               "$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub
+               git ls-files --others --exclude-standard >../actual
+       ) &&
+       echo sub/ >expect &&
+       test_cmp expect actual
+'
+
 test_done