diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-11-20 13:14:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-20 10:47:16 -0800 |
| commit | a6322d079b1d2e2cb72da1271171b35a173f3d22 (patch) | |
| tree | 0c703eb3880645a218de511c43640ea1fcd732be | |
| parent | 9ae2172aed289f2706a0e88288909fa47eddd7e7 (diff) | |
| download | git-a6322d079b1d2e2cb72da1271171b35a173f3d22.tar.gz git-a6322d079b1d2e2cb72da1271171b35a173f3d22.tar.xz | |
merge-recursive: Replace 'except:'
Plain except:s are evil as they will catch all kinds of exceptions
including NameError and AttrubiteError.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-merge-recursive.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 37258ad77..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: @@ -295,7 +295,7 @@ def removeFile(clean, path): raise try: os.removedirs(os.path.dirname(path)) - except: + except OSError: pass def uniquePath(path, branch): |