[PATCH] t0090: be prepared that 'wc -l' writes leading blanks
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Dec 20, 2011, 08:24 UTC
- Message-ID
- <4EF04635.6020406@viscovery.net>
- 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:
Show 6 quoted lines
> 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