public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Ramsay Jones <ramsay@ramsayjones•plus.com>
Cc: "Torsten Bögershausen" <tboegi@web•de>,
	dev+git@drbeat•li, "Git Mailing List" <git@vger•kernel.org>
Subject: Re: t6023 broken under Mac OS
Date: Sat, 02 Jan 2016 11:35:26 -0800	[thread overview]
Message-ID: <xmqqr3hzpyf5.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <5686B400.7000800@ramsayjones.plus.com> (Ramsay Jones's message of "Fri, 1 Jan 2016 17:14:40 +0000")

Ramsay Jones <ramsay@ramsayjones•plus.com> writes:

> Hmm, I have never used a Mac, so I'm just guessing here, but
> you could try something like (obviously untested!):
>
> diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
> index 245359a..68b306f 100755
> --- a/t/t6023-merge-file.sh
> +++ b/t/t6023-merge-file.sh
> @@ -350,7 +350,7 @@ test_expect_success 'conflict at EOF without LF resolved by --union' \
>  test_expect_success 'conflict markers contain CRLF when core.eol=crlf' '
>  	test_must_fail git -c core.eol=crlf merge-file -p \
>  		nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
> -	test $(sed -n "/\.txt\r$/p" output.txt | wc -l) = 3
> +	test $(tr "\015" Q <output.txt | sed -n "/\.txtQ$/p" | wc -l) -eq 3
>  '
>  
>  test_done
>
> [The 'wc -l' portability should only be a problem if you rely on the
> exact textual form of the output, rather than the integer count.
> 'wc -l' is used in many many tests ...]

Looks OK, thanks.

The use of the unportable '\r' with sed exists only in a stale topic
parked on 'pu', so I won't worry about it myself at this point, but
when the topic is rerolled, reviewers please be careful to spot it
and stop it from introducing this bug to our tree.

Thanks.

next prev parent reply	other threads:[~2016-01-02 19:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-01 15:36 t6023 broken under Mac OS Torsten Bögershausen
2016-01-01 17:14 ` 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 [this message]
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=xmqqr3hzpyf5.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=dev+git@drbeat$(echo .)li \
    --cc=git@vger$(echo .)kernel.org \
    --cc=ramsay@ramsayjones$(echo .)plus.com \
    --cc=tboegi@web$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox