mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
[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>
This commit is contained in:
parent
0d214b6619
commit
87a71b65ac
|
@ -41,7 +41,7 @@ def infoMsg(*args):
|
|||
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 updateFile(clean, sha, mode, path, onlyWd=False):
|
|||
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:
|
||||
|
|
Loading…
Reference in a new issue