summaryrefslogtreecommitdiff
path: root/tests/testutils/repo/git.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/testutils/repo/git.py')
-rw-r--r--tests/testutils/repo/git.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/testutils/repo/git.py b/tests/testutils/repo/git.py
index 3eb8c6577..a12ffaba3 100644
--- a/tests/testutils/repo/git.py
+++ b/tests/testutils/repo/git.py
@@ -4,7 +4,7 @@ import shutil
import subprocess
from .repo import Repo
-from ..site import HAVE_GIT
+from ..site import GIT
GIT_ENV = {
'GIT_AUTHOR_DATE': '1320966000 +0200',
@@ -19,7 +19,7 @@ GIT_ENV = {
class Git(Repo):
def __init__(self, directory, subdir):
- if not HAVE_GIT:
+ if not GIT:
pytest.skip("git is not available")
self.submodules = {}
@@ -27,8 +27,8 @@ class Git(Repo):
super(Git, self).__init__(directory, subdir)
def _run_git(self, *args, **kwargs):
- argv = ['git']
- argv.extend(args)
+ argv = [GIT, *args]
+
if 'env' not in kwargs:
kwargs['env'] = dict(GIT_ENV, PWD=self.repo)
kwargs.setdefault('cwd', self.repo)