summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorSebastian Thiel <sebastian.thiel@icloud.com>2020-04-11 10:17:24 +0800
committerSebastian Thiel <sebastian.thiel@icloud.com>2020-04-11 10:17:36 +0800
commit644f75338667592c35f78a2c2ab921e184a903a0 (patch)
tree6085a8eef3b8ffd65ab4eb3d84f40e261a965a08 /git
parent4b6d4885db27b6f3e5a286543fd18247d7d765ab (diff)
downloadgitpython-644f75338667592c35f78a2c2ab921e184a903a0.tar.gz
Revert "When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' subdirectory"
This reverts commit eb792ea76888970d486323df07105129abbbe466. Seems to break CI Related to #1000
Diffstat (limited to 'git')
-rw-r--r--git/repo/fun.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/git/repo/fun.py b/git/repo/fun.py
index e3a7bc57..784a70bf 100644
--- a/git/repo/fun.py
+++ b/git/repo/fun.py
@@ -35,8 +35,7 @@ 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')) or os.environ.has_key('GIT_OBJECT_DIRECTORY')) \
- and osp.isdir(osp.join(d, 'refs')):
+ if osp.isdir(osp.join(d, 'objects')) and osp.isdir(osp.join(d, 'refs')):
headref = osp.join(d, 'HEAD')
return osp.isfile(headref) or \
(osp.islink(headref) and