git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Johnsen <chris_johnsen@pobox.com>
To: Nick Edelen <sirnot@gmail.com>
Cc: Chris Johnsen <chris_johnsen@pobox.com>,
	git@vger.kernel.org, Sam Vilain <sam@vilain.net>,
	Junio C Hamano <gitster@pobox.com>, Nicolas Pitre <nico@cam.org>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Michael J Gruber <git@drmicha.warpmail.net>,
	Jeff King <peff@peff.net>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	Andreas Ericsson <exon@op5.se>,
	Christian Couder <christian@couder.net>
Subject: Re: [PATCH 5/6 (v4)] full integration of rev-cache into git, completed test suite
Date: Wed, 30 Sep 2009 02:53:49 -0500	[thread overview]
Message-ID: <1254297229-14806-1-git-send-email-chris_johnsen@pobox.com> (raw)
In-Reply-To: <op.uzv4covmtdk399@sirnot.private>

(The Cc list of the parent message was truncated.
 The Cc list of this message was adopted from later messages.)

I needed something like the following to get the tests to pass.
If you like it, squash it into 5/6.

-->8--
Subject: [PATCH] t6017: use 'tr -d' to strip spaces from 'wc -c' output

The previous use of 'grep -o "[0-9]*"' was producing an empty string
(GNU grep 2.5.1 on Mac OS X 10.4.11). Additionally, since 'wc' echos
its filename arguments when stdin is not the source, the 'grep -o'
might have also extracted additional decimal strings embedded in the
filename (a SHA-1 hash value).

This 'tr -d' style is used in git-filter-branch.sh, and t6003.
Another alternative (in t1006) is to use 'sed' to strip off the
leading spaces.

Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com>
---
 t/t6017-rev-cache-list.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/t6017-rev-cache-list.sh b/t/t6017-rev-cache-list.sh
index 6ada7ac..3f49cb3 100755
--- a/t/t6017-rev-cache-list.sh
+++ b/t/t6017-rev-cache-list.sh
@@ -246,7 +246,7 @@ test_expect_success 'make fragmented slices' '
 	test `grep "final return value: 0" output.err | wc -l` -eq 3
 '
 
-cache_size=`wc -c .git/rev-cache/$cache_sha1 | grep -o "[0-9]*"`
+cache_size=`wc -c < .git/rev-cache/$cache_sha1 | tr -d ' '`
 test_expect_success 'test --ignore-size function in fuse' '
 	git-rev-cache fuse --ignore-size=$cache_size 2>output.err &&
 	grep "final return value: 0" output.err &&
-- 
1.6.5.rc1.183.g23fa6

  parent reply	other threads:[~2009-09-30  7:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-17 12:31 [PATCH 5/6 (v4)] full integration of rev-cache into git, completed test suite Nick Edelen
2009-08-18 11:51 ` Nick Edelen
2009-08-21  4:48   ` Nick Edelen
2009-09-07 14:11     ` Nick Edelen
2009-09-07 21:06       ` Sam Vilain
2009-09-08 22:24         ` Nick Edelen
2009-09-30  7:53       ` Chris Johnsen [this message]
2009-09-30  8:09         ` Johannes Sixt
2009-10-02 22:12   ` Nick Edelen
2009-10-19 20:30 ` Nick Edelen

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=1254297229-14806-1-git-send-email-chris_johnsen@pobox.com \
    --to=chris_johnsen@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=christian@couder.net \
    --cc=exon@op5.se \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=nico@cam.org \
    --cc=peff@peff.net \
    --cc=sam@vilain.net \
    --cc=sirnot@gmail.com \
    --cc=spearce@spearce.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).