Merge branch 'rs/strbuf-expand-bad-format'

Code clean-up.

* rs/strbuf-expand-bad-format:
  cat-file: use strbuf_expand_bad_format()
  factor out strbuf_expand_bad_format()

diff --cc builtin/cat-file.c
Simple merge

diff --cc builtin/ls-tree.c
Simple merge