summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Bakshi <ambakshi@gmail.com>2013-05-19 06:53:48 -0500
committerJunio C Hamano <gitster@pobox.com>2013-05-20 11:18:43 -0700
commit5dbe064d8cf37142f8c76f73ae0866286a8fb018 (patch)
treeafb57a932ed32dd3942bf0c784f3c361f8b1aa10
parentde3a5c6da194928868b5eee4a9c4d538b4194727 (diff)
downloadgit-5dbe064d8cf37142f8c76f73ae0866286a8fb018.tar.gz
remote-hg: set stdout to binary mode on win32
git clone hangs on windows, and file.write would return errno 22 inside of mercurial's windows.winstdout wrapper class. This patch sets stdout's mode to binary, fixing both issues. [fc: cleaned up] Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index beb864b57e..01555dc347 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -954,6 +954,10 @@ def main(args):
marks_path = os.path.join(dirname, 'marks-hg')
marks = Marks(marks_path)
+ if sys.platform == 'win32':
+ import msvcrt
+ msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
+
parser = Parser(repo)
for line in parser:
if parser.check('capabilities'):