aboutsummaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-04 21:06:30 -0700
committerJunio C Hamano <gitster@pobox.com>2011-11-08 10:36:18 -0800
commit895680f044ebe9df600e6c9e042d40d9d953bc9b (patch)
treee5103e3faab9bb9eee810db5e35cf7d8d4f3e381 /strbuf.c
parentcbda121c993bf14d3743c7fdf0f8c476c9f7c636 (diff)
downloadgit-895680f044ebe9df600e6c9e042d40d9d953bc9b.tar.gz
git-895680f044ebe9df600e6c9e042d40d9d953bc9b.tar.xz
fmt-merge-msg: Add contents of merged tag in the merge message
When a contributor asks the integrator to merge her history, a signed tag can be a good vehicle to communicate the authenticity of the request while conveying other information such as the purpose of the topic. E.g. a signed tag "for-linus" can be created, and the integrator can run: $ git pull git://example.com/work.git/ for-linus This would allow the integrator to run "git verify-tag FETCH_HEAD" to validate the signed tag. Update fmt-merge-msg so that it pre-fills the merge message template with the body (but not signature) of the tag object to help the integrator write a better merge message, in the same spirit as the existing merge.log summary lines. The message that comes from GPG signature validation is also included in the merge message template to help the integrator verify it, but they are prefixed with "#" to make them comments. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/strbuf.c b/strbuf.c
index 3ad2cc001..a84970519 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -397,3 +397,17 @@ int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
return len;
}
+
+void strbuf_add_lines(struct strbuf *out, const char *prefix,
+ const char *buf, size_t size)
+{
+ while (size) {
+ const char *next = memchr(buf, '\n', size);
+ next = next ? (next + 1) : (buf + size);
+ strbuf_addstr(out, prefix);
+ strbuf_add(out, buf, next - buf);
+ size -= next - buf;
+ buf = next;
+ }
+ strbuf_complete_line(out);
+}