comparison mercurial/subrepo.py @ 20816:0c32fafd4b3b stable

subrepo: convert matched string to integer before comparing Git version

(1, '4') is greater than (1, 5) so the version check never actually worked.

20815:6a2acb0d9352

            out, err = self._gitnodir(['--version'])
        m = re.search(r'^git version (\d+)\.(\d+)', out)
        if not m:
            self._ui.warn(_('cannot retrieve git version'))
            return
        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.
        if version < (1, 5):
            raise util.Abort(_('git subrepo requires at least 1.6.0 or later'))

20816:0c32fafd4b3b

            out, err = self._gitnodir(['--version'])
        m = re.search(r'^git version (\d+)\.(\d+)', out)
        if not m:
            self._ui.warn(_('cannot retrieve git version'))
            return
        version = (int(m.group(1)), int(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.
        if version < (1, 5):
            raise util.Abort(_('git subrepo requires at least 1.6.0 or later'))