Merge branch 'js/merge-base'

diff --git a/t/t4112-apply-renames.sh b/t/t4112-apply-renames.sh
index 906188cdf60fdcd4a54883897ef11830f631b553..a06f6956d5c72cae79129fc01a1be2f30121e6fb 100755 (executable)
--- a/t/t4112-apply-renames.sh
+++ b/t/t4112-apply-renames.sh
@@ -139,7 +139,7 @@ rename to include/arch/m32r/klibc/archsetjmp.h
 +#endif /* _KLIBC_ARCHSETJMP_H */
 EOF
 
-find include klibc -type f -print | xargs git-update-cache --add --
+find include klibc -type f -print | xargs git-update-index --add --
 
 test_expect_success 'check rename/copy patch' 'git-apply --check patch'