diff options
author | Junio C Hamano <junkio@cox.net> | 2005-11-25 16:35:20 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-25 16:35:20 -0800 |
commit | 93dcab2937624ebb97f91807576cddb242a55a46 (patch) | |
tree | 8d16464f16866a7f215401a95f8bdaa124799d49 /git-merge-recursive.py | |
parent | 52b6536c624b4998b3730b55b9bc3d7c4e1071a4 (diff) | |
parent | 2a1ddc58e4d2220feea7eba4623dac07a0f83f94 (diff) | |
download | git-93dcab2937624ebb97f91807576cddb242a55a46.tar.gz git-93dcab2937624ebb97f91807576cddb242a55a46.tar.xz |
GIT 0.99.9kv0.99.9k
This is not 1.0rc4 yet, but to push the recent fixes out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
-rwxr-xr-x | git-merge-recursive.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index d7d36aa7d..012923355 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): |