diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2014-11-19 11:20:14 +0100 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2014-11-19 11:20:14 +0100 |
commit | d48ed95cc7bd2ad0ac36593bb2440f24f675eb59 (patch) | |
tree | 62cc11be743350b13f85cc8945233ece21c60610 /git/repo/base.py | |
parent | 6fc9e6150957ff5e011142ec5e9f8522168602ec (diff) | |
parent | 706d3a28b6fa2d7ff90bbc564a53f4007321534f (diff) | |
download | gitpython-d48ed95cc7bd2ad0ac36593bb2440f24f675eb59.tar.gz |
Merge branch 'niyaton-separate-git-dir' into 0.3
Diffstat (limited to 'git/repo/base.py')
-rw-r--r-- | git/repo/base.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/git/repo/base.py b/git/repo/base.py index a5bbaa64..5273d4b2 100644 --- a/git/repo/base.py +++ b/git/repo/base.py @@ -35,8 +35,9 @@ from fun import ( rev_parse, is_git_dir, find_git_dir, - touch - ) + read_gitfile, + touch, + ) import os import sys @@ -52,7 +53,6 @@ __all__ = ('Repo', ) class Repo(object): - """Represents a git repository and allows you to query references, gather commit information, generate diffs, create and clone repositories query the log. @@ -117,6 +117,11 @@ class Repo(object): self.git_dir = gitpath self._working_tree_dir = curpath break + gitpath = read_gitfile(curpath) + if gitpath: + self.git_dir = gitpath + self._working_tree_dir = curpath + break curpath, dummy = os.path.split(curpath) if not dummy: break |