Merge pull request #9011 from Jorge-Rodriguez/develop

Catch os.error instead of all Exceptions

salt/fileserver/gitfs.py

@@ -136,7 +136,7 @@ def init():
                     repo.git.config('http.sslVerify', 'true')
                 else:
                     repo.git.config('http.sslVerify', 'false')
-            except Exception:
+            except os.error:
                 # This exception occurs when two processes are trying to write
                 # to the git config at once, go ahead and pass over it since
                 # this is the only write