path: root/pretty.c
diff options
authorJunio C Hamano <>2018-09-17 20:53:54 (GMT)
committerJunio C Hamano <>2018-09-17 20:53:54 (GMT)
commitfba9654364a523bf146df26052ab05dd52c1d719 (patch)
treecf422aabddfa4c12069785a086e426a971e1ebe6 /pretty.c
parent30035d1d60053e2999041ca14ab607d40206e201 (diff)
parent66e83d9b41f7438cb167b9bb54093ebbf0532437 (diff)
Merge branch 'jk/trailer-fixes'
"git interpret-trailers" and its underlying machinery had a buggy code that attempted to ignore patch text after commit log message, which triggered in various codepaths that will always get the log message alone and never get such an input. * jk/trailer-fixes: append_signoff: use size_t for string offsets sequencer: ignore "---" divider when parsing trailers pretty, ref-filter: format %(trailers) with no_divider option interpret-trailers: allow suppressing "---" divider interpret-trailers: tighten check for "---" patch boundary trailer: pass process_trailer_opts to trailer_info_get() trailer: use size_t for iterating trailer list trailer: use size_t for string offsets
Diffstat (limited to 'pretty.c')
1 files changed, 3 insertions, 0 deletions
diff --git a/pretty.c b/pretty.c
index 98cf522..8ca29e9 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1304,6 +1304,9 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
if (skip_prefix(placeholder, "(trailers", &arg)) {
struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
+ opts.no_divider = 1;
if (*arg == ':') {
for (;;) {