Merge http://www.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index f591a5681dc4ac4abe44cc04a488414481c98ac5..530cc4d2a38c6f4af92097dfe524029ef6a3a6bf 100755 (executable)
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -26,7 +26,7 @@ echo 'This is foo' >foo
 chmod +x foo
 
 test_expect_success setup \
-    'git-update-cache --add foo'
+    'git-update-index --add foo'
 
 test_expect_success apply \
     'git-apply --index --stat --summary --apply test-patch'