Merge branch 'separate-git-dir' of https://github.com/niyaton/GitPython into niyaton-separate-git-dir

Conflicts:
	git/repo/base.py

1 files changed, 7 insertions, 2 deletions

diff --git a/git/repo/base.py b/git/repo/base.py
index a5bbaa64..a111d643 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -36,7 +36,8 @@ from fun import (
                     is_git_dir,
                     find_git_dir,
                     touch
-                )
+					read_gitfile,
+				)
 
 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(gitpath)
+            if gitpath:
+                self.git_dir = gitpath
+                self._working_tree_dir = curpath
+                break
             curpath, dummy = os.path.split(curpath)
             if not dummy:
                 break