X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1020-subdirectory.sh;h=b9cef3422c3ba1392b32ec66f72dc4b7c34f4a43;hb=6ba78238a824282816944550edc4297dd2808a72;hp=4409b87f8d9bf151883c1888ddc64c63b24d85c9;hpb=86183fbb09ffe5d46eae1cf52023a1b5f8fbc047;p=git.git

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 4409b87f8..b9cef3422 100755
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -22,19 +22,19 @@ LF='
 
 test_expect_success 'update-index and ls-files' '
 	cd $HERE &&
-	git-update-index --add one &&
-	case "`git-ls-files`" in
+	git update-index --add one &&
+	case "`git ls-files`" in
 	one) echo ok one ;;
 	*) echo bad one; exit 1 ;;
 	esac &&
 	cd dir &&
-	git-update-index --add two &&
-	case "`git-ls-files`" in
+	git update-index --add two &&
+	case "`git ls-files`" in
 	two) echo ok two ;;
 	*) echo bad two; exit 1 ;;
 	esac &&
 	cd .. &&
-	case "`git-ls-files`" in
+	case "`git ls-files`" in
 	dir/two"$LF"one) echo ok both ;;
 	*) echo bad; exit 1 ;;
 	esac
@@ -42,13 +42,13 @@ test_expect_success 'update-index and ls-files' '
 
 test_expect_success 'cat-file' '
 	cd $HERE &&
-	two=`git-ls-files -s dir/two` &&
+	two=`git ls-files -s dir/two` &&
 	two=`expr "$two" : "[0-7]* \\([0-9a-f]*\\)"` &&
 	echo "$two" &&
-	git-cat-file -p "$two" >actual &&
+	git cat-file -p "$two" >actual &&
 	cmp dir/two actual &&
 	cd dir &&
-	git-cat-file -p "$two" >actual &&
+	git cat-file -p "$two" >actual &&
 	cmp two actual
 '
 rm -f actual dir/actual
@@ -57,17 +57,17 @@ test_expect_success 'diff-files' '
 	cd $HERE &&
 	echo a >>one &&
 	echo d >>dir/two &&
-	case "`git-diff-files --name-only`" in
+	case "`git diff-files --name-only`" in
 	dir/two"$LF"one) echo ok top ;;
 	*) echo bad top; exit 1 ;;
 	esac &&
 	# diff should not omit leading paths
 	cd dir &&
-	case "`git-diff-files --name-only`" in
+	case "`git diff-files --name-only`" in
 	dir/two"$LF"one) echo ok subdir ;;
 	*) echo bad subdir; exit 1 ;;
 	esac &&
-	case "`git-diff-files --name-only .`" in
+	case "`git diff-files --name-only .`" in
 	dir/two) echo ok subdir limited ;;
 	*) echo bad subdir limited; exit 1 ;;
 	esac
@@ -75,35 +75,64 @@ test_expect_success 'diff-files' '
 
 test_expect_success 'write-tree' '
 	cd $HERE &&
-	top=`git-write-tree` &&
+	top=`git write-tree` &&
 	echo $top &&
 	cd dir &&
-	sub=`git-write-tree` &&
+	sub=`git write-tree` &&
 	echo $sub &&
 	test "z$top" = "z$sub"
 '
 
 test_expect_success 'checkout-index' '
 	cd $HERE &&
-	git-checkout-index -f -u one &&
+	git checkout-index -f -u one &&
 	cmp one original.one &&
 	cd dir &&
-	git-checkout-index -f -u two &&
+	git checkout-index -f -u two &&
 	cmp two ../original.two
 '
 
 test_expect_success 'read-tree' '
 	cd $HERE &&
 	rm -f one dir/two &&
-	tree=`git-write-tree` &&
-	git-read-tree --reset -u "$tree" &&
+	tree=`git write-tree` &&
+	git read-tree --reset -u "$tree" &&
 	cmp one original.one &&
 	cmp dir/two original.two &&
 	cd dir &&
 	rm -f two &&
-	git-read-tree --reset -u "$tree" &&
+	git read-tree --reset -u "$tree" &&
 	cmp two ../original.two &&
 	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