Merge branch 'jk/duplicate-objects-in-packs'

[~andy/git] / pretty.c

diff --git a/pretty.c b/pretty.c
index 74563c92b4cdce8e947a2816a8b56355b11439e6..b4e32b74d3622f92b2c5d3b9881e5cdf49d7f375 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -432,7 +432,7 @@ void pp_user_info(struct pretty_print_context *pp,
                map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
 
        if (pp->fmt == CMIT_FMT_EMAIL) {
-               if (pp->from_ident) {
+               if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) {
                        struct strbuf buf = STRBUF_INIT;
 
                        strbuf_addstr(&buf, "From: ");