Respect _common_dir when finding repository config file

Among other things, remotes are now correctly identified when in a
separate worktree.

2 files changed, 6 insertions, 1 deletions

diff --git a/git/repo/base.py b/git/repo/base.py
index 023582b5..125ab802 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -416,7 +416,7 @@ class Repo(object):
         elif config_level == "global":
             return osp.normpath(osp.expanduser("~/.gitconfig"))
         elif config_level == "repository":
-            return osp.normpath(osp.join(self.git_dir, "config"))
+            return osp.normpath(osp.join(self._common_dir or self.git_dir, "config"))
 
         raise ValueError("Invalid configuration level: %r" % config_level)
 
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index e65ead89..7fc49f3b 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -974,6 +974,11 @@ class TestRepo(TestBase):
         commit = repo.head.commit
         self.assertIsInstance(commit, Object)
 
+        # this ensures we can read the remotes, which confirms we're reading
+        # the config correctly.
+        origin = repo.remotes.origin
+        self.assertIsInstance(origin, Remote)
+
         self.assertIsInstance(repo.heads['aaaaaaaa'], Head)
 
     @with_rw_directory