From: Mark Levedahl <mlevedahl@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending
Date: Tue, 16 Jul 2013 15:44:07 -0400 [thread overview]
Message-ID: <51E5A287.40708@gmail.com> (raw)
In-Reply-To: <20130716185933.GO14690@google.com>
On 07/16/2013 02:59 PM, Jonathan Nieder wrote:
> Mark Levedahl wrote:
>
>> Subtests 6, 7, and 9 rely test that merge-recursive correctly
>> ignores whitespace when so directed. Change the particular whitespace
>> sequences to be ones that are not known line endings so the whitespace
>> is not changed when being extracted by line oriented grep.
> merge-recursive needs to be able to deal with \r at EOL, too, so if at
> all possible I would prefer to see the test fixed to pass on Cygwin
> some other way.
>
> Thanks.
>
No line oriented tool is going to avoid this problem. I suppose someone
with much more perl skill I possess could write a grep replacement
explicitly using binary file modes to fix this. Or, the test could just
check the sha1sum of text.txt against a prestored value, Or the test
could use \r\n ONLY on systems that do not use that as a line ending
mode. Or ...
Mark
next prev parent reply other threads:[~2013-07-16 19:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-16 18:33 t3032 incompatible with Cygwin/Windows Mark Levedahl
2013-07-16 18:49 ` [PATCH] t3032 - make compatible with systems using \r\n as a line ending Mark Levedahl
2013-07-16 18:59 ` Jonathan Nieder
2013-07-16 19:44 ` Mark Levedahl [this message]
2013-07-16 20:26 ` Mark Levedahl
2013-07-16 20:32 ` Mark Levedahl
2013-07-17 19:33 ` Junio C Hamano
2013-07-18 21:44 ` [PATCH] test-lib.sh - define and use GREP_STRIPS_CR Mark Levedahl
2013-07-20 19:41 ` Ramsay Jones
2013-07-21 21:04 ` Junio C Hamano
2013-07-18 19:19 ` [PATCH] t3032 - make compatible with systems using \r\n as a line ending Ramsay Jones
2013-07-18 21:47 ` Mark Levedahl
2013-07-16 18:56 ` t3032 incompatible with Cygwin/Windows Jonathan Nieder
2013-07-18 19:11 ` Ramsay Jones
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51E5A287.40708@gmail.com \
--to=mlevedahl@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.