Replace the word 'update-cache' by 'update-index' everywhere

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index b0a873bd7f94c6f16a74b2083688a0b1bb24d07f..159de30e19493587585a81f8ed8ad26960eead62 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3706,7 +3706,7 @@ should use the `--remove` and `--add` flags respectively.
 NOTE! A `--remove` flag does 'not' mean that subsequent filenames will
 necessarily be removed: if the files still exist in your directory
 structure, the index will be updated with their new status, not
 NOTE! A `--remove` flag does 'not' mean that subsequent filenames will
 necessarily be removed: if the files still exist in your directory
 structure, the index will be updated with their new status, not

-removed. The only thing `--remove` means is that update-cache will be
+removed. The only thing `--remove` means is that update-index will be

 considering a removed file to be a valid thing, and if the file really
 does not exist any more, it will update the index accordingly.
 
 considering a removed file to be a valid thing, and if the file really
 does not exist any more, it will update the index accordingly.
 

diff --git a/Makefile b/Makefile
index e0cfff35b627f2e6b31cdc2909de2b3d612b2fc5..c72d40ada34c71e99e319b81ad656ab98e71690c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ all::
 # times (my ext3 doesn't).
 #
 # Define USE_STDEV below if you want git to care about the underlying device
 # times (my ext3 doesn't).
 #
 # Define USE_STDEV below if you want git to care about the underlying device

-# change being considered an inode change from the update-cache perspective.
+# change being considered an inode change from the update-index perspective.

 #
 # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
 #
 #
 # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
 #

diff --git a/configure.ac b/configure.ac
index ab516db379c00ce6eefbed1d282fb7ad39cc0654..8dfe9a0e121e5d795745e6368724b02afc8d66d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -397,7 +397,7 @@ GIT_PARSE_WITH(iconv))
 # times (my ext3 doesn't).
 #
 # Define USE_STDEV below if you want git to care about the underlying device
 # times (my ext3 doesn't).
 #
 # Define USE_STDEV below if you want git to care about the underlying device

-# change being considered an inode change from the update-cache perspective.
+# change being considered an inode change from the update-index perspective.

 
 
 ## Output files
 
 
 ## Output files

diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index 7d92ae3e996b31f8fa9e0b62f40a04ec1940cf70..c44b27aeb24816a346f0aa84d70546a0ffd83b2a 100755 (executable)
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -16,7 +16,7 @@ cat path0 >path1
 chmod +x path1
 
 test_expect_success \
 chmod +x path1
 
 test_expect_success \

-    'update-cache --add two files with and without +x.' \
+    'update-index --add two files with and without +x.' \

     'git update-index --add path0 path1'
 
 mv path0 path0-
     'git update-index --add path0 path1'
 
 mv path0 path0-

diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 063e79257a6e96d9021fa41d18a632560a272776..2fe50bc7ce050f32affa287c5c6e3ab7b1a66f45 100755 (executable)
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -27,7 +27,7 @@ Line 15
 '
 
 test_expect_success \
 '
 
 test_expect_success \

-    'update-cache --add a file.' \
+    'update-index --add a file.' \

     'git update-index --add path0'
 
 test_expect_success \
     'git update-index --add path0'
 
 test_expect_success \

diff --git a/t/t4100/t-apply-1.patch b/t/t4100/t-apply-1.patch
index de587517f434d3801d5e0aad94d4e084cbdd5b06..90ab54f0f586c87ace077be87fba396c8f2781a0 100644 (file)
--- a/t/t4100/t-apply-1.patch
+++ b/t/t4100/t-apply-1.patch
@@ -90,7 +90,7 @@ diff --git a/Documentation/git.txt b/Documentation/git.txt
 diff --git a/Makefile b/Makefile
 --- a/Makefile
 +++ b/Makefile
 diff --git a/Makefile b/Makefile
 --- a/Makefile
 +++ b/Makefile

-@@ -30,7 +30,7 @@ PROG=   git-update-cache git-diff-files 
+@@ -30,7 +30,7 @@ PROG=   git-update-index git-diff-files

        git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
        git-check-files git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
        git-check-files git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \

diff --git a/t/t4100/t-apply-2.patch b/t/t4100/t-apply-2.patch
index cfdc80885b30a8b9b184004072886adc1f88457a..f5c7d601fc955b15d15012a5b49df83364b6ebf4 100644 (file)
--- a/t/t4100/t-apply-2.patch
+++ b/t/t4100/t-apply-2.patch
@@ -9,7 +9,7 @@ diff --git a/Makefile b/Makefile
 -      git-deltafy-script
 +      git-deltafy-script git-fetch-script
  
 -      git-deltafy-script
 +      git-deltafy-script git-fetch-script
  

- PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
+ PROG=   git-update-index git-diff-files git-init-db git-write-tree \

        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
 diff --git a/git-pull-script b/git-fetch-script
 similarity index 87%
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
 diff --git a/git-pull-script b/git-fetch-script
 similarity index 87%

diff --git a/t/t4100/t-apply-5.patch b/t/t4100/t-apply-5.patch
index de11623d1babf50952e45b46015ae45bb07ac2bf..5f6ddc105950eac20bcacb7987fabff015320ee3 100644 (file)
--- a/t/t4100/t-apply-5.patch
+++ b/t/t4100/t-apply-5.patch
@@ -200,7 +200,7 @@ diff a/Documentation/git.txt b/Documentation/git.txt
 diff a/Makefile b/Makefile
 --- a/Makefile
 +++ b/Makefile
 diff a/Makefile b/Makefile
 --- a/Makefile
 +++ b/Makefile

-@@ -30,7 +30,7 @@ PROG=   git-update-cache git-diff-files 
+@@ -30,7 +30,7 @@ PROG=   git-update-index git-diff-files

        git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
        git-check-files git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
        git-check-files git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \

diff --git a/t/t4100/t-apply-6.patch b/t/t4100/t-apply-6.patch
index d9753637fc23822795bca72c26b71d0ba71e6552..a72729a712038dc64f55d154eb9a94713e3269c9 100644 (file)
--- a/t/t4100/t-apply-6.patch
+++ b/t/t4100/t-apply-6.patch
@@ -8,7 +8,7 @@ diff a/Makefile b/Makefile
 -      git-deltafy-script
 +      git-deltafy-script git-fetch-script
  
 -      git-deltafy-script
 +      git-deltafy-script git-fetch-script
  

- PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
+ PROG=   git-update-index git-diff-files git-init-db git-write-tree \

        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
 diff a/git-fetch-script b/git-fetch-script
 --- /dev/null
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
 diff a/git-fetch-script b/git-fetch-script
 --- /dev/null