Mercurial > hg-stable
changeset 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.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 20 Mar 2014 19:38:17 -0700 |
| parents | 6a2acb0d9352 |
| children | e5641536e4d5 |
| files | mercurial/subrepo.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/subrepo.py Thu Mar 20 19:37:01 2014 -0700 +++ b/mercurial/subrepo.py Thu Mar 20 19:38:17 2014 -0700 @@ -1121,7 +1121,7 @@ if not m: self._ui.warn(_('cannot retrieve git version')) return - version = (int(m.group(1)), m.group(2)) + 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.