setup.c:verify_non_filename(): don't die unnecessarily while disambiguating

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 4409b87f8d9bf151883c1888ddc64c63b24d85c9..1e8f9e59dfe7e63177dea0a2e4b5c018a4756994 100755 (executable)
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -106,4 +106,33 @@ test_expect_success 'read-tree' '
        cmp ../one ../original.one
 '
 
+test_expect_success 'no file/rev ambiguity check inside .git' '
+       cd $HERE &&
+       git commit -a -m 1 &&
+       cd $HERE/.git &&
+       git show -s HEAD
+'
+
+test_expect_success 'no file/rev ambiguity check inside a bare repo' '
+       cd $HERE &&
+       git clone -s --bare .git foo.git &&
+       cd foo.git && GIT_DIR=. git show -s HEAD
+'
+
+# This still does not work as it should...
+: test_expect_success 'no file/rev ambiguity check inside a bare repo' '
+       cd $HERE &&
+       git clone -s --bare .git foo.git &&
+       cd foo.git && git show -s HEAD
+'
+
+test_expect_success 'detection should not be fooled by a symlink' '
+       cd $HERE &&
+       rm -fr foo.git &&
+       git clone -s .git another &&
+       ln -s another yetanother &&
+       cd yetanother/.git &&
+       git show -s HEAD
+'
+
 test_done