Merge branch 'tr/cache-tree'

* tr/cache-tree:
  t0090: be prepared that 'wc -l' writes leading blanks
This commit is contained in:
Junio C Hamano
2011-12-20 12:16:04 -08:00

View File

@ -17,15 +17,13 @@ cmp_cache_tree () {
# test-dump-cache-tree already verifies that all existing data is # test-dump-cache-tree already verifies that all existing data is
# correct. # correct.
test_shallow_cache_tree () { test_shallow_cache_tree () {
echo "SHA " \ printf "SHA (%d entries, 0 subtrees)\n" $(git ls-files|wc -l) >expect &&
"($(git ls-files|wc -l) entries, 0 subtrees)" >expect &&
cmp_cache_tree expect cmp_cache_tree expect
} }
test_invalid_cache_tree () { test_invalid_cache_tree () {
echo "invalid (0 subtrees)" >expect && echo "invalid (0 subtrees)" >expect &&
echo "SHA #(ref) " \ printf "SHA #(ref) (%d entries, 0 subtrees)\n" $(git ls-files|wc -l) >>expect &&
"($(git ls-files|wc -l) entries, 0 subtrees)" >>expect &&
cmp_cache_tree expect cmp_cache_tree expect
} }