Skip to content

Commit

Permalink
shortlog: implement --group=author in terms of --group=<format>
Browse files Browse the repository at this point in the history
Instead of handling SHORTLOG_GROUP_AUTHOR separately, reimplement it as
a special case of the new `--group=<format>` mode, where the author mode
is a shorthand for `--group='%aN <%aE>'.

Note that we still need to keep the SHORTLOG_GROUP_AUTHOR enum since it
has a different meaning in `read_from_stdin()`, where it is still used
for a different purpose.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
ttaylorr authored and gitster committed Oct 24, 2022
1 parent 10538e2 commit 9c10d4f
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions builtin/shortlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,6 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
}
oneline_str = oneline.len ? oneline.buf : "<none>";

if (log->groups & SHORTLOG_GROUP_AUTHOR) {
strbuf_reset(&ident);
format_commit_message(commit,
log->email ? "%aN <%aE>" : "%aN",
&ident, &ctx);
if (!HAS_MULTI_BITS(log->groups) ||
strset_add(&dups, ident.buf))
insert_one_record(log, ident.buf, oneline_str);
}
if (log->groups & SHORTLOG_GROUP_COMMITTER) {
strbuf_reset(&ident);
format_commit_message(commit,
Expand Down Expand Up @@ -383,6 +374,10 @@ void shortlog_init(struct shortlog *log)

void shortlog_finish_setup(struct shortlog *log)
{
if (log->groups & SHORTLOG_GROUP_AUTHOR)
string_list_append(&log->format,
log->email ? "%aN <%aE>" : "%aN");

string_list_sort(&log->trailers);
}

Expand Down

0 comments on commit 9c10d4f

Please sign in to comment.