use git rev-parse to look for config file

Author: bdauvergne

git/repo/base.py

@@ -66,7 +66,7 @@ class Repo(object):
     'git_dir' is the .git repository directory, which is always set."""
     DAEMON_EXPORT_FILE = 'git-daemon-export-ok'
 
-    git = None  # Must exist, or  __del__  will fail in case we raise on `__init__()`
+    _git = None  # Must exist, or  __del__  will fail in case we raise on `__init__()`
     working_dir = None
     _working_tree_dir = None
     git_dir = None
@@ -202,14 +202,29 @@ def __init__(self, path=None, odbt=GitCmdObjectDB, search_parent_directories=Fal
         # END working dir handling
 
         self.working_dir = self._working_tree_dir or self.common_dir
-        self.git = self.GitCommandWrapperType(self.working_dir)
 
         # special handling, in special times
         args = [osp.join(self.common_dir, 'objects')]
         if issubclass(odbt, GitCmdObjectDB):
             args.append(self.git)
         self.odb = odbt(*args)
 
+    class GitCommand(object):
+        def __get__(self, instance, owner):
+            if instance is not None:
+                working_dir = instance._working_tree_dir or instance.common_dir
+                if instance._git:
+                    if instance._git._working_dir != working_dir:
+                        instance.close()
+                        instance._git = None
+
+                if not instance._git:
+                    instance._git = instance.GitCommandWrapperType(working_dir)
+                return instance._git
+            raise AttributeError('git')
+
+    git = GitCommand()
+
     def __enter__(self):
         return self
 
@@ -223,8 +238,8 @@ def __del__(self):
             pass
 
     def close(self):
-        if self.git:
-            self.git.clear_cache()
+        if self._git:
+            self._git.clear_cache()
             # Tempfiles objects on Windows are holding references to
             # open files until they are collected by the garbage
             # collector, thus preventing deletion.
@@ -431,7 +446,15 @@ def _get_config_path(self, config_level):
         elif config_level == "global":
             return osp.normpath(osp.expanduser("~/.gitconfig"))
         elif config_level == "repository":
-            return osp.normpath(osp.join(self._common_dir or self.git_dir, "config"))
+            try:
+                config_path = self.git.rev_parse("config", git_path=True)
+            except GitCommandError:
+                return osp.normpath(osp.join(self._common_dir or self.git_dir, "config"))
+            else:
+                if self.git._working_dir:
+                    return osp.normpath(osp.join(self.git._working_dir, config_path))
+                else:
+                    return config_path
 
         raise ValueError("Invalid configuration level: %r" % config_level)