From: Johannes Sixt Date: Tue, 20 Dec 2011 08:24:21 +0000 (+0100) Subject: t0090: be prepared that 'wc -l' writes leading blanks X-Git-Tag: v1.7.9-rc0~40^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cd675565647b2ccacdd6c93841b4ff06c32b16a;p=git.git t0090: be prepared that 'wc -l' writes leading blanks Use 'printf %d $(whatever|wc -l)' so that the shell removes the blanks for us. Signed-off-by: Johannes Sixt Acked-by: Thomas Rast Signed-off-by: Junio C Hamano --- diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh index f97256292..6c33e28ee 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 }