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

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index eeb3d24da8224a2275513918480c0b7866dfbe01..ea7f994a4f3a94e0801e03ce9cf77027d348067b 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -41,7 +41,7 @@ def infoMsg(*args):
     if callDepth == 0:
         if len(ca) > 1:
             runProgram(['git-read-tree', h1.tree()])
     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
         # 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:
                 assert(False)
 
         if updateWd and updateCache:

-            runProgram(['git-update-cache', '--add', '--', path])
+            runProgram(['git-update-index', '--add', '--', path])

         elif updateCache:
         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):
                         '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 not cleanCache and clean:
             try: