Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

[thirdparty/git.git] / pretty.c

diff --git a/pretty.c b/pretty.c
index b32f0369531c6f14799329890880600e714e6b4b..93eb6e837071a3e54437a92c0e2338e1ce1ef6f4 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -696,7 +696,7 @@ static size_t format_person_part(struct strbuf *sb, char part,
        mail = s.mail_begin;
        maillen = s.mail_end - s.mail_begin;
 
-       if (part == 'N' || part == 'E') /* mailmap lookup */
+       if (part == 'N' || part == 'E' || part == 'L') /* mailmap lookup */
                mailmap_name(&mail, &maillen, &name, &namelen);
        if (part == 'n' || part == 'N') {       /* name */
                strbuf_add(sb, name, namelen);
@@ -706,6 +706,13 @@ static size_t format_person_part(struct strbuf *sb, char part,
                strbuf_add(sb, mail, maillen);
                return placeholder_len;
        }
+       if (part == 'l' || part == 'L') {       /* local-part */
+               const char *at = memchr(mail, '@', maillen);
+               if (at)
+                       maillen = at - mail;
+               strbuf_add(sb, mail, maillen);
+               return placeholder_len;
+       }
 
        if (!s.date_begin)
                goto skip;