summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-11-20 12:14:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-20 18:47:16 (GMT)
commita6322d079b1d2e2cb72da1271171b35a173f3d22 (patch)
tree0c703eb3880645a218de511c43640ea1fcd732be /git-merge-recursive.py
parent9ae2172aed289f2706a0e88288909fa47eddd7e7 (diff)
downloadgit-a6322d079b1d2e2cb72da1271171b35a173f3d22.zip
git-a6322d079b1d2e2cb72da1271171b35a173f3d22.tar.gz
git-a6322d079b1d2e2cb72da1271171b35a173f3d22.tar.bz2
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>
Diffstat (limited to 'git-merge-recursive.py')
-rwxr-xr-xgit-merge-recursive.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 37258ad..0129233 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):