X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-recursive.py;h=01292335509bfd1460e12e0e1d86c4fcd1f265a4;hb=562051809589574576971c53c23aad93f8c395d9;hp=d7d36aa7d11299d3a1e91dce1bc9572ac56a7c08;hpb=3eeb419968c1f8f0a762a7127db770e9d9c8037d;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index d7d36aa7..01292335 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -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:
@@ -293,6 +293,10 @@ def removeFile(clean, path):
         except OSError, e:
             if e.errno != errno.ENOENT and e.errno != errno.EISDIR:
                 raise
+        try:
+            os.removedirs(os.path.dirname(path))
+        except OSError:
+            pass
 
 def uniquePath(path, branch):
     def fileExists(path):