From a388b10fc17c435df32c3875225a1468edad9535 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 15 Aug 2017 06:23:56 -0400 Subject: pretty: move trailer formatting to trailer.c The next commit will add many features to the %(trailer) placeholder in pretty.c. We'll need to access some internal functions of trailer.c for that, so our options are either: 1. expose those functions publicly or 2. make an entry point into trailer.c to do the formatting Doing (2) ends up exposing less surface area, though do note that caveats in the docstring of the new function. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- pretty.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'pretty.c') diff --git a/pretty.c b/pretty.c index 6cc812c2c7..33054e22cd 100644 --- a/pretty.c +++ b/pretty.c @@ -870,16 +870,6 @@ const char *format_subject(struct strbuf *sb, const char *msg, return msg; } -static void format_trailers(struct strbuf *sb, const char *msg) -{ - struct trailer_info info; - - trailer_info_get(&info, msg); - strbuf_add(sb, info.trailer_start, - info.trailer_end - info.trailer_start); - trailer_info_release(&info); -} - static void parse_commit_message(struct format_commit_context *c) { const char *msg = c->message + c->message_off; @@ -1273,7 +1263,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ } if (starts_with(placeholder, "(trailers)")) { - format_trailers(sb, msg + c->subject_off); + struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT; + format_trailers_from_commit(sb, msg + c->subject_off, &opts); return strlen("(trailers)"); } -- cgit v1.2.1