From: Charles Bailey <charles@hashpling.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Miklos Vajna <vmiklos@frugalware.org>, git@vger.kernel.org
Subject: Re: [PATCH] t/t7600: avoid GNUism in grep
Date: Sat, 05 Jan 2008 07:14:09 +0000 [thread overview]
Message-ID: <477F2E41.60105@hashpling.org> (raw)
In-Reply-To: <7v63y8g40u.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
> diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
> index 6424c6e..21862ac 100755
> --- a/t/t7600-merge.sh
> +++ b/t/t7600-merge.sh
> @@ -371,7 +371,7 @@ test_expect_success 'override config option -n' '
> git merge --summary c2 >diffstat.txt &&
> verify_merge file result.1-5 msg.1-5 &&
> verify_parents $c1 $c2 &&
> - if ! grep -e "^ file | \+2 +-$" diffstat.txt
> + if ! grep -e "^ file | *2 +-$" diffstat.txt
> then
> echo "[OOPS] diffstat was not generated"
> fi
> @@ -386,7 +386,7 @@ test_expect_success 'override config option --summary' '
> git merge -n c2 >diffstat.txt &&
> verify_merge file result.1-5 msg.1-5 &&
> verify_parents $c1 $c2 &&
> - if grep -e "^ file | \+2 +-$" diffstat.txt
> + if grep -e "^ file | +2 +-$" diffstat.txt
> then
> echo "[OOPS] diffstat was generated"
> false
I'm not sure that you quite made the change you meant to change in the
second chunk ( ' +' vs. ' *' ? ).
Charles.
next prev parent reply other threads:[~2008-01-05 7:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1199506008-12225-1-git-send-email-vmiklos@frugalware.org>
2008-01-05 6:48 ` [PATCH] t/t3800: do not use a temporary file to hold expected result Junio C Hamano
2008-01-05 6:50 ` [PATCH] t/t7600: avoid GNUism in grep Junio C Hamano
2008-01-05 7:14 ` Charles Bailey [this message]
2008-01-05 8:02 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=477F2E41.60105@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vmiklos@frugalware.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 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.