Merge branch 'fg/exclude-bq'

diff --git a/t/t2100-update-cache-badpath.sh b/t/t2100-update-cache-badpath.sh
index 86b7375c6c26c51d67b4d4c4d9e6bce278cf5144..6ef2dcfd8afece86aaf6345630179af179eb2ed9 100755 (executable)
--- a/t/t2100-update-cache-badpath.sh
+++ b/t/t2100-update-cache-badpath.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-update-cache nonsense-path test.
+test_description='git update-index nonsense-path test.
 
 This test creates the following structure in the cache:
 
@@ -12,7 +12,7 @@ This test creates the following structure in the cache:
     path2/file2 - a file in a directory
     path3/file3 - a file in a directory
 
-and tries to git-update-cache --add the following:
+and tries to git update-index --add the following:
 
     path0/file0 - a file in a directory
     path1/file1 - a file in a directory
@@ -31,8 +31,8 @@ date >path2/file2
 date >path3/file3
 
 test_expect_success \
-    'git-update-cache --add to add various paths.' \
-    'git-update-cache --add -- path0 path1 path2/file2 path3/file3'
+    'git update-index --add to add various paths.' \
+    'git update-index --add -- path0 path1 path2/file2 path3/file3'
 
 rm -fr path?
 
@@ -44,8 +44,8 @@ date >path1/file1
 
 for p in path0/file0 path1/file1 path2 path3
 do
-       test_expect_failure \
-           "git-update-cache to add conflicting path $p should fail." \
-           "git-update-cache --add -- $p"
+       test_expect_success \
+           "git update-index to add conflicting path $p should fail." \
+           "test_must_fail git update-index --add -- $p"
 done
 test_done