Hi, This series makes wt-status and builtin-commit code a little less explicit about the '#' signs they produce in their output. The main goal is to make messages like "\n" "It looks like you may be committing a MERGE.\n" "If this is not correct, please remove the file\n" " %s\n" "and try again.\n" "" safe to translate by getting rid of the functionally important initial # signs; a nice side effect is to make the source code a little easier # to read and change (for example if we want to use some other kind of formatting some day for "git status" output). The first two patches (va_copy, strbuf_vaddf) are stolen from Jeff's GIT_TRACE_FACET series. Thanks for your help and patience so far. I hope the series can be useful. Jeff King (2): compat: provide a fallback va_copy definition strbuf: add strbuf_vaddf Jonathan Nieder (3): wt-status: add helpers for printing wt-status lines commit: refer to commit template as s->fp commit, status: use status_printf{,_ln,_more} helpers builtin/commit.c | 58 ++++++++++---------- color.c | 9 +++ color.h | 3 + compat/msvc.h | 1 - fsck.c | 14 +---- git-compat-util.h | 4 + merge-recursive.c | 15 +----- strbuf.c | 27 +++++---- strbuf.h | 2 + trace.c | 32 ++--------- wt-status.c | 160 ++++++++++++++++++++++++++++++++++++++-------------- wt-status.h | 7 ++ 12 files changed, 195 insertions(+), 137 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html