mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-07 16:36:13 +02:00
Code

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>
This commit is contained in:
Fredrik Kuivinen 2005-11-20 13:14:37 +01:00 committed by Junio C Hamano
parent 9ae2172aed
commit a6322d079b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-merge-recursive.py
View File

@ -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):