From 644f75338667592c35f78a2c2ab921e184a903a0 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 11 Apr 2020 10:17:24 +0800 Subject: [PATCH] Revert "When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' subdirectory" This reverts commit eb792ea76888970d486323df07105129abbbe466. Seems to break CI Related to #1000 --- git/repo/fun.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/git/repo/fun.py b/git/repo/fun.py index e3a7bc57a..784a70bf3 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