From: Junio C Hamano <gitster@pobox.com>
To: "Dustin Spicuzza via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Dustin Spicuzza <dustin@virtualroadside.com>
Subject: Re: [PATCH 1/1] cvsexportcommit: force crlf translation
Date: Tue, 07 May 2019 18:22:59 +0900 [thread overview]
Message-ID: <xmqqtve6lito.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <9b508af11be125ce5fd80c40c732dbcaf45067fb.1556575126.git.gitgitgadget@gmail.com> (Dustin Spicuzza via GitGitGadget's message of "Mon, 29 Apr 2019 14:58:47 -0700 (PDT)")
"Dustin Spicuzza via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Dustin Spicuzza <dustin@virtualroadside.com>
>
> When using cvsnt + msys + git, it seems like the output of cvs status
> had \r\n in it, and caused the command to fail.
This is a bit under-explained in that it does not make it clear
where the right place to fix would be. From "X did Y which caused
the command to fail", a possible right fix could be "so fix it by
telling X not to do Y", but of course a patch to fix cvsnt won't
come to this list ;-)
I haven't thought things through, so let's think it aloud and
enumerate what should have been explained in the log message here.
- With binmode(":crlf"), (i.e. if the platform uses CRLF convert
external CRLF into internal '\n'), the change hopes not to affect
platforms that do not use CRLF.
- "it SEEMS LIKE the output of cvs status had CRLF in it", i.e. it
is uncertain if everybody on the platform has the same issue.
But by using binmode(":crlf"), if some other implementations of
"cvs status" on the platform used LF, they won't get negatively
affected by this change, either.
So, I guess the change is safe enough that it does not hurt other
people.
>
> This fixes that.
>
> Signed-off-by: Dustin Spicuzza <dustin@virtualroadside.com>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> git-cvsexportcommit.perl | 1 +
> 1 file changed, 1 insertion(+)
>
> 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 {
next prev parent reply other threads:[~2019-05-07 9:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 21:58 [PATCH 0/1] Fix cvsexportcommit with CR/LF line endings Johannes Schindelin via GitGitGadget
2019-04-29 21:58 ` [PATCH 1/1] cvsexportcommit: force crlf translation Dustin Spicuzza via GitGitGadget
2019-05-07 9:22 ` Junio C Hamano [this message]
2019-05-07 13:51 ` Dustin Spicuzza
2019-05-07 14:02 ` Junio C Hamano
2019-05-08 10:56 ` Johannes Schindelin
2019-05-08 10:59 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtve6lito.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=dustin@virtualroadside.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).