From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: jacob@initialcommit.io, peff@peff.net, gitster@pobox.com,
avarab@gmail.com
Subject: [PATCH v2 2/6] shortlog: make trailer insertion a noop when appropriate
Date: Thu, 20 Oct 2022 23:11:32 -0400 [thread overview]
Message-ID: <7decccad7ccb39eed67bab87ed665beccf5d392f.1666320509.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1666320509.git.me@ttaylorr.com>
When there are no trailers to insert, it is natural that
insert_records_from_trailers() should return without having done any
work.
But instead we guard this call unnecessarily by first checking whether
`log->groups` has the `SHORTLOG_GROUP_TRAILER` bit set.
Prepare to match a similar pattern in the future where a function which
inserts records of a certain type does no work when no specifiers
matching that type are given.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
builtin/shortlog.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 53c379a51d..18f0800c82 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -170,6 +170,9 @@ static void insert_records_from_trailers(struct shortlog *log,
const char *commit_buffer, *body;
struct strbuf ident = STRBUF_INIT;
+ if (!log->trailers.nr)
+ return;
+
/*
* Using format_commit_message("%B") would be simpler here, but
* this saves us copying the message.
@@ -240,9 +243,7 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
strset_add(&dups, ident.buf))
insert_one_record(log, ident.buf, oneline_str);
}
- if (log->groups & SHORTLOG_GROUP_TRAILER) {
- insert_records_from_trailers(log, &dups, commit, &ctx, oneline_str);
- }
+ insert_records_from_trailers(log, &dups, commit, &ctx, oneline_str);
strset_clear(&dups);
strbuf_release(&ident);
--
2.38.0.16.g393fd4c6db
next prev parent reply other threads:[~2022-10-21 3:12 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-11 0:33 [PATCH 0/7] shortlog: introduce `--group=<format>` Taylor Blau
2022-10-11 0:34 ` [PATCH 1/7] Documentation: extract date-options.txt Taylor Blau
2022-10-11 0:54 ` Jeff King
2022-10-11 1:02 ` Taylor Blau
2022-10-11 0:34 ` [PATCH 2/7] shortlog: accept `--date`-related options Taylor Blau
2022-10-11 0:48 ` Jeff King
2022-10-11 1:14 ` Taylor Blau
2022-10-11 0:34 ` [PATCH 3/7] shortlog: extract `--group` fragment for translation Taylor Blau
2022-10-11 10:55 ` Ævar Arnfjörð Bjarmason
2022-10-11 13:24 ` Jeff King
2022-10-11 0:34 ` [PATCH 4/7] shortlog: support arbitrary commit format `--group`s Taylor Blau
2022-10-11 1:12 ` Jeff King
2022-10-11 1:24 ` Taylor Blau
2022-10-11 1:28 ` Taylor Blau
2022-10-11 2:03 ` Jeff King
2022-10-11 2:02 ` Jeff King
2022-10-21 2:39 ` Taylor Blau
2022-10-21 5:21 ` Jeff King
2022-10-21 22:12 ` Taylor Blau
2022-10-11 0:34 ` [PATCH 5/7] shortlog: implement `--group=author` in terms of `--group=<format>` Taylor Blau
2022-10-11 1:34 ` Jeff King
2022-10-11 1:48 ` Taylor Blau
2022-10-11 2:15 ` Jeff King
2022-10-21 2:03 ` Taylor Blau
2022-10-21 2:02 ` Taylor Blau
2022-10-21 5:03 ` Jeff King
2022-10-21 22:05 ` Taylor Blau
2022-10-11 10:57 ` Ævar Arnfjörð Bjarmason
2022-10-11 11:07 ` Ævar Arnfjörð Bjarmason
2022-10-11 0:34 ` [PATCH 6/7] shortlog: implement `--group=committer` " Taylor Blau
2022-10-11 1:35 ` Jeff King
2022-10-11 0:34 ` [PATCH 7/7] shortlog: implement `--group=trailer` " Taylor Blau
2022-10-11 1:50 ` Jeff King
2022-10-11 1:57 ` Jeff King
2022-10-21 1:38 ` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 0/6] shortlog: introduce `--group=<format>` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 1/6] shortlog: accept `--date`-related options Taylor Blau
2022-10-21 5:32 ` Jeff King
2022-10-21 21:55 ` Taylor Blau
2022-10-21 3:11 ` Taylor Blau [this message]
2022-10-21 5:38 ` [PATCH v2 2/6] shortlog: make trailer insertion a noop when appropriate Jeff King
2022-10-21 21:57 ` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 3/6] shortlog: extract `--group` fragment for translation Taylor Blau
2022-10-21 5:40 ` Jeff King
2022-10-21 3:11 ` [PATCH v2 4/6] shortlog: support arbitrary commit format `--group`s Taylor Blau
2022-10-21 5:48 ` Jeff King
2022-10-21 22:07 ` Taylor Blau
2022-10-21 3:11 ` [PATCH v2 5/6] shortlog: implement `--group=author` in terms of `--group=<format>` Taylor Blau
2022-10-21 5:50 ` Jeff King
2022-10-21 3:11 ` [PATCH v2 6/6] shortlog: implement `--group=committer` " Taylor Blau
2022-10-21 5:51 ` Jeff King
2022-10-21 5:53 ` [PATCH v2 0/6] shortlog: introduce `--group=<format>` Jeff King
2022-10-21 22:25 ` [PATCH v3 0/7] " Taylor Blau
2022-10-21 22:25 ` [PATCH v3 1/7] shortlog: accept `--date`-related options Taylor Blau
2022-10-21 22:25 ` [PATCH v3 2/7] shortlog: make trailer insertion a noop when appropriate Taylor Blau
2022-10-21 22:25 ` [PATCH v3 3/7] shortlog: extract `--group` fragment for translation Taylor Blau
2022-10-21 22:25 ` [PATCH v3 4/7] shortlog: support arbitrary commit format `--group`s Taylor Blau
2022-10-22 0:28 ` Jeff King
2022-10-21 22:25 ` [PATCH v3 5/7] shortlog: extract `shortlog_finish_setup()` Taylor Blau
2022-10-21 22:25 ` [PATCH v3 6/7] shortlog: implement `--group=author` in terms of `--group=<format>` Taylor Blau
2022-10-21 22:25 ` [PATCH v3 7/7] shortlog: implement `--group=committer` " Taylor Blau
2022-10-22 0:31 ` [PATCH v3 0/7] shortlog: introduce `--group=<format>` Jeff King
2022-10-24 18:55 ` [PATCH " Taylor Blau
2022-10-24 18:55 ` [PATCH 1/7] shortlog: accept `--date`-related options Taylor Blau
2022-10-24 18:55 ` [PATCH 2/7] shortlog: make trailer insertion a noop when appropriate Taylor Blau
2022-10-24 18:55 ` [PATCH 3/7] shortlog: extract `--group` fragment for translation Taylor Blau
2022-10-24 18:55 ` [PATCH 4/7] shortlog: support arbitrary commit format `--group`s Taylor Blau
2022-10-24 18:55 ` [PATCH 5/7] shortlog: extract `shortlog_finish_setup()` Taylor Blau
2022-10-24 18:55 ` [PATCH 6/7] shortlog: implement `--group=author` in terms of `--group=<format>` Taylor Blau
2022-10-24 18:55 ` [PATCH 7/7] shortlog: implement `--group=committer` " Taylor Blau
2022-10-24 21:59 ` [PATCH 0/7] shortlog: introduce `--group=<format>` Junio C Hamano
2022-10-24 23:45 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7decccad7ccb39eed67bab87ed665beccf5d392f.1666320509.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob@initialcommit.io \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).