@matheusbsbs / matheus-bagliano / commits / 87a71b65ac
Fork 0

[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>

Fredrik Kuivinen committed Sep 13, 2005 at 23:40 UTC 87a71b65acc10c4879b13d2030185e5640a087cd
1 file changed +4 -4
git-merge-recursive.py
+4 -4
@@ -41,7 +41,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0):
41 if callDepth == 0:
42 if len(ca) > 1:
43 runProgram(['git-read-tree', h1.tree()])
44 - runProgram(['git-update-cache', '-q', '--refresh'])
44 + runProgram(['git-update-index', '-q', '--refresh'])
45 # Use the original index if we only have one common ancestor
46
47 cleanCache = False
@@ -205,14 +205,14 @@ def processEntry(entry, branch1Name, branch2Name, files, dirs, cleanCache):
205 assert(False)
206
207 if updateWd and updateCache:
208 - runProgram(['git-update-cache', '--add', '--', path])
208 + runProgram(['git-update-index', '--add', '--', path])
209 elif updateCache:
210 - runProgram(['git-update-cache', '--add', '--cacheinfo',
210 + runProgram(['git-update-index', '--add', '--cacheinfo',
211 '0%o' % mode, sha, path])
212
213 def removeFile(clean, path):
214 if cleanCache or (not cleanCache and clean):
215 - runProgram(['git-update-cache', '--force-remove', '--', path])
215 + runProgram(['git-update-index', '--force-remove', '--', path])
216
217 if not cleanCache and clean:
218 try: