diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py index 7f4cf938643d5182a20744854c8fcd247c6e31aa_bWVyY3VyaWFsL3N1YnJlcG8ucHk=..6a2acb0d9352d5be5c495ad332497ad60a19578e_bWVyY3VyaWFsL3N1YnJlcG8ucHk= 100644 --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -1117,7 +1117,7 @@ raise self._gitexecutable = 'git.cmd' out, err = self._gitnodir(['--version']) - m = re.search(r'^git version (\d+)\.(\d+)\.(\d+)', out) + m = re.search(r'^git version (\d+)\.(\d+)', out) if not m: self._ui.warn(_('cannot retrieve git version')) return @@ -1121,7 +1121,7 @@ if not m: self._ui.warn(_('cannot retrieve git version')) return - version = (int(m.group(1)), m.group(2), m.group(3)) + version = (int(m.group(1)), m.group(2)) # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, # despite the docstring comment. For now, error on 1.4.0, warn on # 1.5.0 but attempt to continue. @@ -1125,5 +1125,5 @@ # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, # despite the docstring comment. For now, error on 1.4.0, warn on # 1.5.0 but attempt to continue. - if version < (1, 5, 0): + if version < (1, 5): raise util.Abort(_('git subrepo requires at least 1.6.0 or later')) @@ -1129,5 +1129,5 @@ raise util.Abort(_('git subrepo requires at least 1.6.0 or later')) - elif version < (1, 6, 0): + elif version < (1, 6): self._ui.warn(_('git subrepo requires at least 1.6.0 or later')) def _gitcommand(self, commands, env=None, stream=False):