Merge branch 'ds/cvsexportcommit-force-text'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 May 2019 07:45:31 +0000 (16:45 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 May 2019 07:45:31 +0000 (16:45 +0900)
"git cvsexportcommit" running on msys did not expect cvsnt showed
"cvs status" output with CRLF line endings.

* ds/cvsexportcommit-force-text:
cvsexportcommit: force crlf translation

git-cvsexportcommit.perl
index d13f02da95f3b9b3921c3ccff9e3b6a7511cd666..fc00d5946af68e536876d42a1463b21924edefa5 100755 (executable)
@@ -431,6 +431,7 @@ END
 sub safe_pipe_capture {
     my @output;
     if (my $pid = open my $child, '-|') {
+       binmode($child, ":crlf");
        @output = (<$child>);
        close $child or die join(' ',@_).": $! $?";
     } else {