Mercurial > public > mercurial-scm > hg
diff mercurial/subrepo.py @ 28670:ff0d3b6b287f
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 29 Mar 2016 12:29:00 -0500 |
parents | 345f4fa4cc89 34d43cb85de8 |
children | 9d3e280864fb |
line wrap: on
line diff
--- a/mercurial/subrepo.py Fri Mar 25 23:05:32 2016 -0700 +++ b/mercurial/subrepo.py Tue Mar 29 12:29:00 2016 -0500 @@ -1385,6 +1385,11 @@ are not supported and very probably fail. """ self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands))) + if env is None: + env = os.environ.copy() + # fix for Git CVE-2015-7545 + if 'GIT_ALLOW_PROTOCOL' not in env: + env['GIT_ALLOW_PROTOCOL'] = 'file:git:http:https:ssh' # unless ui.quiet is set, print git's stderr, # which is mostly progress and useful info errpipe = None