Merge pull request #47965 from Ch3LL/gitpy_mac_3.1

Nicole Thomas · web-flow · commit dbc798ac68b2 · 2018-06-06T09:54:08.000-04:00
Add PR 47924 from 2018.3 branch
diff --git a/salt/utils/gitfs.py b/salt/utils/gitfs.py
@@ -93,7 +93,7 @@
     import git
     import gitdb
     GITPYTHON_VERSION = _LooseVersion(git.__version__)
-except ImportError:
+except Exception:
     GITPYTHON_VERSION = None
 
 try:
