merge-recursive::removeFile: remove empty directories

Junio C Hamano · Junio C Hamano · commit 80e21a9ed809 · 2005-11-19T19:57:54.000-08:00
When the last file in a directory is removed as the result of a
merge, try to rmdir the now-empty directory.

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
@@ -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:
+            pass
 
 def uniquePath(path, branch):
     def fileExists(path):
