aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-20 12:16:04 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-20 12:16:04 -0800
commit3fabe9966b478f92cecdec9012dcb8bda9e17d25 (patch)
tree07732ef60f39fe9b291160b09c6347fddafd61db
parent876a6f4991abdd72ea707b193b4f2b831096ad3c (diff)
parent4cd675565647b2ccacdd6c93841b4ff06c32b16a (diff)
downloadgit-3fabe9966b478f92cecdec9012dcb8bda9e17d25.tar.gz
git-3fabe9966b478f92cecdec9012dcb8bda9e17d25.tar.xz
Merge branch 'tr/cache-tree'
* tr/cache-tree: t0090: be prepared that 'wc -l' writes leading blanks
-rwxr-xr-xt/t0090-cache-tree.sh6
1 files changed, 2 insertions, 4 deletions
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
}