From: Johannes Sixt <j.sixt@viscovery.net>
To: Brian Gernhardt <benji@silverinsanity.com>
Cc: Git List <git@vger.kernel.org>, Thomas Rast <trast@student.ethz.ch>
Subject: [PATCH] t0090: be prepared that 'wc -l' writes leading blanks
Date: Tue, 20 Dec 2011 09:24:21 +0100 [thread overview]
Message-ID: <4EF04635.6020406@viscovery.net> (raw)
In-Reply-To: <4EE8C3AD.9050605@viscovery.net>
From: Johannes Sixt <j6t@kdbg.org>
Use 'printf %d $(whatever|wc -l)' so that the shell removes the blanks
for us.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
Am 12/14/2011 16:41, schrieb Johannes Sixt:
> I'd solve it by moving the command substitution outside the quoted string:
>
> printf "SHA (%d entries, 0 subtrees)\n" \
> $(git ls-files | wc -l) >expect &&
>
> Other proposed solutions add another process. I don't like that on Windows ;)
And here is a proper patch to that effect.
-- Hannes
t/t0090-cache-tree.sh | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index f972562..6c33e28 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -17,15 +17,13 @@ cmp_cache_tree () {
# test-dump-cache-tree already verifies that all existing data is
# correct.
test_shallow_cache_tree () {
- echo "SHA " \
- "($(git ls-files|wc -l) entries, 0 subtrees)" >expect &&
+ printf "SHA (%d entries, 0 subtrees)\n" $(git ls-files|wc -l) >expect &&
cmp_cache_tree expect
}
test_invalid_cache_tree () {
echo "invalid (0 subtrees)" >expect &&
- echo "SHA #(ref) " \
- "($(git ls-files|wc -l) entries, 0 subtrees)" >>expect &&
+ printf "SHA #(ref) (%d entries, 0 subtrees)\n" $(git ls-files|wc -l) >>expect &&
cmp_cache_tree expect
}
--
1.7.8.1499.g39f909
next prev parent reply other threads:[~2011-12-20 8:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-14 14:35 t0090-cache-tree fails due to wc whitespace Brian Gernhardt
2011-12-14 14:57 ` Stefano Lattarini
2011-12-14 15:09 ` Hallvard Breien Furuseth
2011-12-14 15:41 ` Johannes Sixt
2011-12-20 8:24 ` Johannes Sixt [this message]
2011-12-20 9:17 ` [PATCH] t0090: be prepared that 'wc -l' writes leading blanks Thomas Rast
2011-12-14 15:43 ` t0090-cache-tree fails due to wc whitespace Thomas Rast
2011-12-14 15:54 ` Andreas Schwab
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=4EF04635.6020406@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=benji@silverinsanity.com \
--cc=git@vger.kernel.org \
--cc=trast@student.ethz.ch \
/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).