From 87a71b65acc10c4879b13d2030185e5640a087cd Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Tue, 13 Sep 2005 23:40:47 +0200 Subject: [PATCH] [PATCH] Adjust git-merge-recursive.py for the new tool names. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-merge-recursive.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index eeb3d24d..ea7f994a 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -41,7 +41,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0): 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 @@ def processEntry(entry, branch1Name, branch2Name, files, dirs, cleanCache): 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: -- 2.11.0