pretty: separate out the logic to decide the use of in-body from
When pretty-printing the log message for a given commit in the e-mail format (e.g. "git format-patch"), we add an in-body "From:" header when the author identity of the commit is different from the identity of the person whose identity appears in the header of the e-mail (the latter is passed with them "--from" option). Split out the logic into a helper function, as we would want to extend the condition further. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 29, 2022 at 14:38 UTC
b84d01393679d0e09d6fd198e771f2d1f5563986
1 file changed
+9
-1
pretty.c
+9
-1
@@ -477,6 +477,14 @@ end:
477
}
478
}
479
480
+static int use_in_body_from(const struct pretty_print_context *pp,
481
+ const struct ident_split *ident)
482
+{
483
+ if (ident_cmp(pp->from_ident, ident))
484
+ return 1;
485
+ return 0;
486
+}
487
+
488
void pp_user_info(struct pretty_print_context *pp,
489
const char *what, struct strbuf *sb,
490
const char *line, const char *encoding)
@@ -503,7 +511,7 @@ void pp_user_info(struct pretty_print_context *pp,
511
map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
512
513
if (cmit_fmt_is_mail(pp->fmt)) {
506
- if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) {
514
+ if (pp->from_ident && use_in_body_from(pp, &ident)) {
515
struct strbuf buf = STRBUF_INIT;
516
517
strbuf_addstr(&buf, "From: ");