summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 16:45:31 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 16:45:31 +0900
commitb5fb62bf4967c412bc800fce4a4a97e7006daa32 (patch)
treeddd481d8306e3989c1b1afc6a9adb857b5d38359
parentMerge branch 'sg/ci-libsvn-perl' (diff)
parentcvsexportcommit: force crlf translation (diff)
downloadtgif-b5fb62bf4967c412bc800fce4a4a97e7006daa32.tar.xz
Merge branch 'ds/cvsexportcommit-force-text'
"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
-rwxr-xr-xgit-cvsexportcommit.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index d13f02da95..fc00d5946a 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -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 {