From eb792ea76888970d486323df07105129abbbe466 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 11 Apr 2020 09:58:54 +0800 Subject: When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' subdirectory This will work for default git object databases only, which use git as object database directly. Related to #1000 --- git/repo/fun.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'git') diff --git a/git/repo/fun.py b/git/repo/fun.py index 784a70bf..e3a7bc57 100644 --- a/git/repo/fun.py +++ b/git/repo/fun.py @@ -35,7 +35,8 @@ def is_git_dir(d): There is the unlikely danger to throw if we see directories which just look like a worktree dir, but are none.""" if osp.isdir(d): - if osp.isdir(osp.join(d, 'objects')) and osp.isdir(osp.join(d, 'refs')): + if (osp.isdir(osp.join(d, 'objects')) or os.environ.has_key('GIT_OBJECT_DIRECTORY')) \ + and osp.isdir(osp.join(d, 'refs')): headref = osp.join(d, 'HEAD') return osp.isfile(headref) or \ (osp.islink(headref) and -- cgit v1.2.1