X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft0000-basic.sh;h=186de7024336ca98bd5dcea6f675e1fc221d0ce0;hb=8232dc427fb4b92b38e74e9e93b52231a67e354f;hp=3260d1d7a746f6968aab0d3f374bd7e76bf33bd0;hpb=e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e;p=git.git

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 3260d1d7a..186de7024 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -31,12 +31,12 @@ fi
 . ./test-lib.sh
 
 ################################################################
-# init-db has been done in an empty repository.
+# git-init has been done in an empty repository.
 # make sure it is empty.
 
 find .git/objects -type f -print >should-be-empty
 test_expect_success \
-    '.git/objects should be empty after git-init-db in an empty repo.' \
+    '.git/objects should be empty after git-init in an empty repo.' \
     'cmp -s /dev/null should-be-empty' 
 
 # also it should have 2 subdirectories; no fan-out anymore, pack, and info.
@@ -272,4 +272,13 @@ test_expect_success \
 	 wc -l) &&
      test $numparent = 1'
 
+test_expect_success 'update-index D/F conflict' '
+	mv path0 tmp &&
+	mv path2 path0 &&
+	mv tmp path2 &&
+	git update-index --add --replace path2 path0/file2 &&
+	numpath0=$(git ls-files path0 | wc -l) &&
+	test $numpath0 = 1
+'
+
 test_done