git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: dev+git@drbeat.li, Git Mailing List <git@vger.kernel.org>
Subject: t6023 broken under Mac OS
Date: Fri, 1 Jan 2016 16:36:48 +0100	[thread overview]
Message-ID: <56869D10.9090105@web.de> (raw)

The (last) test case
'conflict markers contain CRLF when core.eol=crlf'

does not work as expected under Mac OS: "wc -l" is not portable and the line
test $(sed -n "/\.txt\r$/p" output.txt | wc -l) = 3
fails.

(The other problem is that the usage of "\r" in a sed expression is not portable
either.)

In other words: I don't have a solution at hand.

             reply	other threads:[~2016-01-01 15:37 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-01 15:36 Torsten Bögershausen [this message]
2016-01-01 17:14 ` t6023 broken under Mac OS Ramsay Jones
2016-01-01 17:49   ` Torsten Bögershausen
2016-01-01 21:14     ` Ramsay Jones
2016-01-01 22:23       ` Torsten Bögershausen
2016-01-02 19:35   ` Junio C Hamano
2016-01-02 20:06     ` Beat Bolli

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=56869D10.9090105@web.de \
    --to=tboegi@web.de \
    --cc=dev+git@drbeat.li \
    --cc=git@vger.kernel.org \
    /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 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 NNTP newsgroup(s).