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
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:
if clean:
sys.exit(0)
else:
- print 'Automatic merge failed, fix up by hand'
sys.exit(1)