# HG changeset patch # User Patrick Mezard # Date 1188148404 -7200 # Node ID 20770c5d41e0610ce3bbdec109d19601c0817072 # Parent 7d3dcdd92a1a1870ac1d25d9674ef0569451950d# Parent 9d7052f17d77ce70414fec8cb9131108a3706aab Merge with crew-stable diff --git a/hgext/convert/git.py b/hgext/convert/git.py --- a/hgext/convert/git.py +++ b/hgext/convert/git.py @@ -1,6 +1,7 @@ # git support for the convert extension import os +from mercurial import util from common import NoRepo, commit, converter_source @@ -41,7 +42,8 @@ class convert_git(converter_source): def catfile(self, rev, type): if rev == "0" * 40: raise IOError() - fh = self.gitcmd("git-cat-file %s %s 2>/dev/null" % (type, rev)) + fh = self.gitcmd("git-cat-file %s %s 2>%s" % (type, rev, + util.nulldev)) return fh.read() def getfile(self, name, rev): @@ -101,7 +103,8 @@ class convert_git(converter_source): def gettags(self): tags = {} - fh = self.gitcmd('git-ls-remote --tags "%s" 2>/dev/null' % self.path) + fh = self.gitcmd('git-ls-remote --tags "%s" 2>%s' % (self.path, + util.nulldev)) prefix = 'refs/tags/' for line in fh: line = line.strip()