X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-merge-recursive.py;h=b7fb0961e0758c566c459f51b6983f99e694ee4f;hb=0f737464a6734d917431cf8df14eb04bd9c4cd8d;hp=37258ad77481fb0edaf2b084b7be173d8da8c586;hpb=80e21a9ed809d98788ff6fb705d911bee37d460b;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 37258ad7..b7fb0961 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -98,7 +98,7 @@ getFilesRE = re.compile(r'^([0-7]+) (\S+) ([0-9a-f]{40})\t(.*)$', re.S)
 def getFilesAndDirs(tree):
     files = Set()
     dirs = Set()
-    out = runProgram(['git-ls-tree', '-r', '-z', tree])
+    out = runProgram(['git-ls-tree', '-r', '-z', '-t', tree])
     for l in out.split('\0'):
         m = getFilesRE.match(l)
         if m:
@@ -245,7 +245,7 @@ def updateFileExt(sha, mode, path, updateCache, updateWd):
 
             try:
                 createDir = not stat.S_ISDIR(os.lstat(p).st_mode)
-            except: 
+            except OSError:
                 createDir = True
             
             if createDir:
@@ -295,7 +295,7 @@ def removeFile(clean, path):
                 raise
         try:
             os.removedirs(os.path.dirname(path))
-        except:
+        except OSError:
             pass
 
 def uniquePath(path, branch):
@@ -828,8 +828,6 @@ def processEntry(entry, branch1Name, branch2Name):
             if cacheOnly:
                 updateFile(False, sha, mode, path)
             else:
-                updateFileExt(aSha, aMode, path,
-                              updateCache=True, updateWd=False)
                 updateFileExt(sha, mode, path, updateCache=False, updateWd=True)
     else:
         die("ERROR: Fatal merge failure, shouldn't happen.")