diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-13 23:40:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-13 15:45:25 -0700 |
| commit | 87a71b65acc10c4879b13d2030185e5640a087cd (patch) | |
| tree | 54b59e2eb54ad90d7682b12f8474f5b10ac1eed9 | |
| parent | 0d214b6619bf14a6409a2a1ba079f3530d40ee41 (diff) | |
| download | git-87a71b65acc10c4879b13d2030185e5640a087cd.tar.gz | |
[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>
| -rwxr-xr-x | git-merge-recursive.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index eeb3d24da8..ea7f994a4f 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: |