Merge branch 'rs/strbuf-expand-step'
commitda269af9207e38e820daad8aa993caa7d2fad76c
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Jul 2023 18:54:45 +0000 (6 11:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Jul 2023 18:54:45 +0000 (6 11:54 -0700)
tree28567788ed00e6c037cb93684e95a473e3d2f412
parenta646b86cd10282de2ceb64ef33b5412e4fb2a54c
parent4416b86c6b34dad64b556bb1eb6711d5e6595a48
Merge branch 'rs/strbuf-expand-step'

Code clean-up around strbuf_expand() API.

* rs/strbuf-expand-step:
  strbuf: simplify strbuf_expand_literal_cb()
  replace strbuf_expand() with strbuf_expand_step()
  replace strbuf_expand_dict_cb() with strbuf_expand_step()
  strbuf: factor out strbuf_expand_step()
  pretty: factor out expand_separator()
builtin/branch.c
builtin/cat-file.c
builtin/ls-files.c
builtin/ls-tree.c
convert.c
merge-ll.c
pretty.c
strbuf.c
strbuf.h