[PATCH] Adjust git-merge-recursive.py for the new tool names.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index eeb3d24..ea7f994 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -41,7 +41,7 @@
if callDepth == 0:
if len(ca) > 1:
runProgram(['git-read-tree', h1.tree()])
- runProgram(['git-update-cache', '-q', '--refresh'])
+ runProgram(['git-update-index', '-q', '--refresh'])
# Use the original index if we only have one common ancestor
cleanCache = False
@@ -205,14 +205,14 @@
assert(False)
if updateWd and updateCache:
- runProgram(['git-update-cache', '--add', '--', path])
+ runProgram(['git-update-index', '--add', '--', path])
elif updateCache:
- runProgram(['git-update-cache', '--add', '--cacheinfo',
+ runProgram(['git-update-index', '--add', '--cacheinfo',
'0%o' % mode, sha, path])
def removeFile(clean, path):
if cleanCache or (not cleanCache and clean):
- runProgram(['git-update-cache', '--force-remove', '--', path])
+ runProgram(['git-update-index', '--force-remove', '--', path])
if not cleanCache and clean:
try:
