diff options
| author |  Jeff King <peff@peff.net> | 2020-09-27 04:40:11 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-27 12:21:05 -0700 |
| commit | 56d5dde7526e725a9e590f32fe38ce6b3391bc36 (patch) | |
| tree | fa9c3bd197b2c82945b9659c6fac17b665edad24 /Documentation | |
| parent | shortlog: rename parse_stdin_ident() (diff) | |
| download | tgif-56d5dde7526e725a9e590f32fe38ce6b3391bc36.tar.xz | |
shortlog: parse trailer idents
Trailers don't necessarily contain name/email identity values, so
shortlog has so far treated them as opaque strings. However, since many
trailers do contain identities, it's useful to treat them as such when
they can be parsed. That lets "-e" work as usual, as well as mailmap.
When they can't be parsed, we'll continue with the old behavior of
treating them as a single string (there's no new test for that here,
since the existing tests cover a trailer like this).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-shortlog.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index 9e94613e13..3db0db2da0 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -64,9 +64,10 @@ Likewise, commits with multiple trailers (e.g., multiple signoffs) may be counted more than once (but only once per unique trailer value in that commit). + -The contents of each trailer value are taken literally and completely. -No mailmap is applied, and the `-e` option has no effect (if the trailer -contains a username and email, they are both always shown). +Shortlog will attempt to parse each trailer value as a `name <email>` +identity. If successful, the mailmap is applied and the email is omitted +unless the `--email` option is specified. If the value cannot be parsed +as an identity, it will be taken literally and completely. -c:: --committer:: |