Skip to content

Commit c296c6f

Browse files
committed
Fix up the renaming.
1 parent 12c93f5 commit c296c6f

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

git/remote.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ def fetch(self, refspec=None, progress=None, **kwargs):
514514
:note:
515515
As fetch does not provide progress information to non-ttys, we cannot make
516516
it available here unfortunately as in the 'push' method."""
517-
if self.repo.git.version >= (1, 7, 0, 0): kwargs['progress'] = True
517+
if self.repo.git.version_info >= (1, 7, 0, 0): kwargs['progress'] = True
518518
proc = self.repo.git.fetch(self, refspec, with_extended_output=True, as_process=True, v=True, **kwargs)
519519
return self._get_fetch_info_from_stderr(proc, progress or RemoteProgress())
520520

@@ -526,7 +526,7 @@ def pull(self, refspec=None, progress=None, **kwargs):
526526
:param progress: see 'push' method
527527
:param kwargs: Additional arguments to be passed to git-pull
528528
:return: Please see 'fetch' method """
529-
if self.repo.git.version >= (1, 7, 0, 0): kwargs['progress'] = True
529+
if self.repo.git.version_info >= (1, 7, 0, 0): kwargs['progress'] = True
530530
proc = self.repo.git.pull(self, refspec, with_extended_output=True, as_process=True, v=True, **kwargs)
531531
return self._get_fetch_info_from_stderr(proc, progress or RemoteProgress())
532532

@@ -548,7 +548,7 @@ def push(self, refspec=None, progress=None, **kwargs):
548548
in their flags.
549549
If the operation fails completely, the length of the returned IterableList will
550550
be null."""
551-
if self.repo.git.version >= (1, 7, 0, 0): kwargs['progress'] = True
551+
if self.repo.git.version_info >= (1, 7, 0, 0): kwargs['progress'] = True
552552
proc = self.repo.git.push(self, refspec, porcelain=True, as_process=True, progress=True, v=True, **kwargs)
553553
return self._get_push_info(proc, progress or RemoteProgress())
554554

git/repo/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ def _clone(cls, git, url, path, odb_default_type, progress, **kwargs):
684684
# END windows handling
685685

686686
try:
687-
if git.version >= (1, 7, 0, 0): kwargs['progress'] = True
687+
if git.version_info >= (1, 7, 0, 0): kwargs['progress'] = True
688688
proc = git.clone(url, path, with_extended_output=True, as_process=True, v=True, **kwargs)
689689
if progress:
690690
_digest_process_messages(proc.stderr, progress)

git/util.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import time
1111
import tempfile
1212
import platform
13+
from exc import GitCommandError
1314

1415
from gitdb.util import (
1516
make_sha,

0 commit comments

Comments
 (0)