diff options
| author | Luc Ritchie <wlritchi@delegopayments.com> | 2018-09-14 13:10:37 -0400 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2018-10-13 13:41:13 +0200 |
| commit | 89df64132ccd76568ade04b5cf4e68cb67f0c5c0 (patch) | |
| tree | 06d7d78850d51f7362bda6eb6f239f7c93ba349e /git/repo | |
| parent | a8591a094a768d73e6efb5a698f74d354c989291 (diff) | |
| download | gitpython-89df64132ccd76568ade04b5cf4e68cb67f0c5c0.tar.gz | |
Respect _common_dir when finding repository config file
Among other things, remotes are now correctly identified when in a
separate worktree.
Diffstat (limited to 'git/repo')
| -rw-r--r-- | git/repo/base.py | 2 |
1 files changed, 1 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) |