Merge branch 'jc/fmt-req-fix'

* jc/fmt-req-fix:
userformat_find_requirements(): find requirement for the correct format

diff --combined pretty.c
index dff5c8d1831ca4019d1a502a393cb95f20ad18f7,7d23c1f8481af3cfd73c76c76fb2e13a2a7e4a9c..52174fd14722d131d533013120517f5fcb8d82f6
--- 1/pretty.c
--- 2/pretty.c
+++ b/pretty.c
@@@ -339,7 -339,6 +339,7 @@@ void pp_user_info(const char *what, enu
        if (fmt == CMIT_FMT_EMAIL) {
                char *name_tail = strchr(line, '<');
                int display_name_length;
 +              int final_line;
                if (!name_tail)
                        return;
                while (line < name_tail && isspace(name_tail[-1]))
@@@ -354,14 -353,6 +354,14 @@@
                        add_rfc2047(sb, quoted.buf, quoted.len, encoding);
                        strbuf_release(&quoted);
                }
 +              for (final_line = 0; final_line < sb->len; final_line++)
 +                      if (sb->buf[sb->len - final_line - 1] == '\n')
 +                              break;
 +              if (namelen - display_name_length + final_line > 78) {
 +                      strbuf_addch(sb, '\n');
 +                      if (!isspace(name_tail[0]))
 +                              strbuf_addch(sb, ' ');
 +              }
                strbuf_add(sb, name_tail, namelen - display_name_length);
                strbuf_addch(sb, '\n');
        } else {
@@@ -1084,7 -1075,7 +1084,7 @@@ void userformat_find_requirements(cons
                        return;
                fmt = user_format;
        }
-       strbuf_expand(&dummy, user_format, userformat_want_item, w);
+       strbuf_expand(&dummy, fmt, userformat_want_item, w);
        strbuf_release(&dummy);
  }