[PATCH 1/2] pretty: separate out the logic to decide the use of in-body from
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 26, 2022, 21:32 UTC
- Message-ID
- <20220826213203.3258022-2-gitster@pobox.com>
- In-Reply-To
- <20220826213203.3258022-1-gitster@pobox.com>
When pretty-printing the log message for a given commit in e-mail format (e.g. "git format-patch"), we add in-body "From:" header when the author identity of the commit is different from the identity of the person who is "sending" the mail.
Split out the logic into a helper function. Because the "from_ident must be set" condition is there not because it is used in the ident_cmp() next, but because the codepath that is entered when this logic says "Yes, you should use in-body from" requires values there in from_ident member, so separate it out into an if() statement on its own to clarify it.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- pretty.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pretty.c b/pretty.c index 6d819103fb..51e3fa5736 100644 --- a/pretty.c +++ b/pretty.c @@ -477,6 +477,15 @@ static void append_line_with_color(struct strbuf *sb, struct grep_opt *opt, } } +static int use_inbody_from(const struct pretty_print_context *pp, const struct ident_split *ident) +{ + if (!pp->from_ident) + return 0; + if (ident_cmp(pp->from_ident, ident)) + return 1; + return 0; +} + void pp_user_info(struct pretty_print_context *pp, const char *what, struct strbuf *sb, const char *line, const char *encoding) @@ -503,7 +512,7 @@ void pp_user_info(struct pretty_print_context *pp, map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen); if (cmit_fmt_is_mail(pp->fmt)) { - if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) { + if (use_inbody_from(pp, &ident)) { struct strbuf buf = STRBUF_INIT; strbuf_addstr(&buf, "From: ");
-- 2.37.2-587-g47adba97a9