Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 28670:ff0d3b6b287f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 29 Mar 2016 12:29:00 -0500
parents 345f4fa4cc89 34d43cb85de8
children 9d3e280864fb
comparison
equal deleted inserted replaced
28669:c4b727795d6a 28670:ff0d3b6b287f
1383 1383
1384 The methods tries to call the git command. versions prior to 1.6.0 1384 The methods tries to call the git command. versions prior to 1.6.0
1385 are not supported and very probably fail. 1385 are not supported and very probably fail.
1386 """ 1386 """
1387 self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands))) 1387 self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands)))
1388 if env is None:
1389 env = os.environ.copy()
1390 # fix for Git CVE-2015-7545
1391 if 'GIT_ALLOW_PROTOCOL' not in env:
1392 env['GIT_ALLOW_PROTOCOL'] = 'file:git:http:https:ssh'
1388 # unless ui.quiet is set, print git's stderr, 1393 # unless ui.quiet is set, print git's stderr,
1389 # which is mostly progress and useful info 1394 # which is mostly progress and useful info
1390 errpipe = None 1395 errpipe = None
1391 if self.ui.quiet: 1396 if self.ui.quiet:
1392 errpipe = open(os.devnull, 'w') 1397 errpipe = open(os.devnull, 'w')