summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorSebastian Thiel <sebastian.thiel@icloud.com>2020-04-11 14:48:00 +0800
committerSebastian Thiel <sebastian.thiel@icloud.com>2020-04-11 14:48:00 +0800
commit466ed9c7a6a9d6d1a61e2c5dbe6f850ee04e8b90 (patch)
tree5984380e3fec7d565c6dc9b738995f9c8f01d71c /git
parentbdd4368489345a53bceb40ebd518b961f871b7b3 (diff)
downloadgitpython-466ed9c7a6a9d6d1a61e2c5dbe6f850ee04e8b90.tar.gz
Test for PyOxidizer and avoid trying to use __file__ if present
Fixes #1002
Diffstat (limited to 'git')
-rw-r--r--git/__init__.py2
m---------git/ext/gitdb0
2 files changed, 1 insertions, 1 deletions
diff --git a/git/__init__.py b/git/__init__.py
index e98806d4..8f32d07b 100644
--- a/git/__init__.py
+++ b/git/__init__.py
@@ -18,7 +18,7 @@ __version__ = 'git'
#{ Initialization
def _init_externals():
"""Initialize external projects by putting them into the path"""
- if __version__ == 'git':
+ if __version__ == 'git' and 'PYOXIDIZER' not in os.environ:
sys.path.insert(0, osp.join(osp.dirname(__file__), 'ext', 'gitdb'))
try:
diff --git a/git/ext/gitdb b/git/ext/gitdb
-Subproject 253dfe7092f83229d9e99059e7c51f678a557fd
+Subproject 919695d4e4101237a8d2c4fb65807a42b7ff63d