Here's an updated patchset. The first 2 are the exact same as what Junio has sent. Jonathan Tan (2): strbuf: make add_lines() public strbuf: move env-using functions to environment.c Junio C Hamano (2): strbuf_commented_addf(): drop the comment_line_char parameter strbuf_add_commented_lines(): drop the comment_line_char parameter add-patch.c | 8 +++---- builtin/branch.c | 2 +- builtin/merge.c | 8 +++---- builtin/notes.c | 9 ++++---- builtin/stripspace.c | 2 +- builtin/tag.c | 4 ++-- environment.c | 32 +++++++++++++++++++++++++++ environment.h | 14 ++++++++++++ fmt-merge-msg.c | 9 +++----- rebase-interactive.c | 8 +++---- sequencer.c | 14 ++++++------ strbuf.c | 51 +++++++++----------------------------------- strbuf.h | 20 ++++------------- wt-status.c | 6 +++--- 14 files changed, 92 insertions(+), 95 deletions(-) -- 2.42.0.820.g83a721a137-goog