summaryrefslogtreecommitdiff
path: root/strbuf.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 14:40:12 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-20 14:40:12 -0800
commit0877510ad4e8b951b08f9cbb25cfc0d994468979 (patch)
treedcfc43b1cf44ba49c3f9f206504d2f1cfee8bcc6 /strbuf.h
parent15a873d6e85d8089117a6a2141c8158bd370cf49 (diff)
parent1a893064d7b403625896a2c8bdab39f0f7db61d5 (diff)
downloadgit-0877510ad4e8b951b08f9cbb25cfc0d994468979.tar.gz
Merge branch 'jk/warn-author-committer-after-commit'
* jk/warn-author-committer-after-commit: user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere commit.c::print_summary: do not release the format string too early commit: allow suppression of implicit identity advice commit: show interesting ident information in summary strbuf: add strbuf_addbuf_percentquote strbuf_expand: convert "%%" to "%" Conflicts: builtin-commit.c ident.c
Diffstat (limited to 'strbuf.h')
-rw-r--r--strbuf.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/strbuf.h b/strbuf.h
index b37f06a34b..8ce2a2e54b 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -115,6 +115,7 @@ struct strbuf_expand_dict_entry {
const char *value;
};
extern size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder, void *context);
+extern void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src);
__attribute__((format (printf,2,3)))
extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);