[PATCH] 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 <redacted>


---

 git-merge-recursive.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: c037ce1b974c7d0671312b52ed46ed405c1a8443
e90840aaf9adb880297d98e16031665b426e3987

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 52e2ad7..3e7758d 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py

@@ -243,7 +243,7 @@ def updateFileExt(sha, mode, path, updat
 
             try:
                 createDir = not stat.S_ISDIR(os.lstat(p).st_mode)
-            except: 
+            except OSError:
                 createDir = True
             
             if createDir:

---
0.99.9.GIT