From: Junio C Hamano <gitster@pobox.com>
To: Laszlo Ersek <lersek@redhat.com>
Cc: git@vger.kernel.org, jordan.l.justen@intel.com, matt.fleming@intel.com
Subject: Re: [PATCH for-maint] apply: gitdiff_verify_name(): accept "/dev/null\r"
Date: Tue, 23 Sep 2014 13:17:18 -0700 [thread overview]
Message-ID: <xmqqoau6hz1t.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq1tr2jhg2.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 23 Sep 2014 11:54:37 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> SMTP transport may be CRLF-unsafe, so I have a suspicion that it may
> turn out that what you are trying to do might be an equilvalent of
>
> git format-patch ... |
> # first lose all \r\n
> dos2unix |
> # then make everything \r\n
> unix2dos |
> # and apply
> git am
>
> which is not workable in the first place. I dunno.
This is a tangent, but if the problem were slightly different, I
would be more sympathetic. For example
A popular MUA, when asked to write out a message in the mbox
format, ends _all_ the lines in its output with CRLF, whether
the original was sent as LF-only or CRLF, and there is no way to
convince it to use LF-only. "git apply" fails to grok such an
input.
could be, if the use of such an MUA is very prevalent, a common
problem worth working around.
But then I would suspect that the workaround for such a case may not
be "accept /dev/null\n and /dev/null\r\n equally". It is likely
that the right workaround for such a case would be to "turn all \r\n
into \n before processing".
prev parent reply other threads:[~2014-09-23 20:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 1:09 [PATCH for-maint] apply: gitdiff_verify_name(): accept "/dev/null\r" Laszlo Ersek
2014-09-23 18:54 ` Junio C Hamano
2014-09-23 19:31 ` Laszlo Ersek
2014-09-23 19:56 ` Junio C Hamano
2014-09-23 20:33 ` Laszlo Ersek
2014-09-23 20:40 ` Junio C Hamano
2014-09-23 20:57 ` Laszlo Ersek
2014-09-23 20:02 ` Junio C Hamano
2014-09-23 20:32 ` Laszlo Ersek
2014-09-23 20:35 ` Junio C Hamano
2014-09-23 20:49 ` Laszlo Ersek
2014-09-23 21:35 ` Junio C Hamano
2014-09-24 12:56 ` Laszlo Ersek
2014-09-24 17:55 ` Junio C Hamano
2014-09-23 20:17 ` Junio C Hamano [this message]
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=xmqqoau6hz1t.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jordan.l.justen@intel.com \
--cc=lersek@redhat.com \
--cc=matt.fleming@intel.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).