[PATCH 5 of 6] convert: fix error in git solaris code
timeless
timeless at gmail.com
Sun May 1 14:16:37 CDT 2011
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1304269031 -7200
# Node ID ecb0abeb482d17f1a842d3e7319941d94cbb970a
# Parent 481b9a5c3bc45c6c14173f59027a0fca26b58537
convert: fix error in git solaris code
diff --git a/hgext/convert/git.py b/hgext/convert/git.py
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
@@ -35,7 +35,7 @@ class convert_git(converter_source):
def gitopen(self, s, noerr=False):
if noerr:
(sin, so, se) = util.popen3('GIT_DIR=%s %s' % (self.path, s))
- return stdout
+ return so
else:
util.popen('GIT_DIR=%s %s' % (self.path, s), 'rb')
More information about the Mercurial-devel
mailing list