From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Derrick Stolee <derrickstolee@github.com>
Subject: [PATCH 4/4] commit-graph: invert negated conditional
Date: Thu, 10 Aug 2023 16:37:42 -0400 [thread overview]
Message-ID: <6ea610f7d2faf77d1984d641d1b857a9c4b1214d.1691699851.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1691699851.git.me@ttaylorr.com>
Now that we're using `commit_graph_generation_from_graph()` (which can
return a zero value) and we have a pure if/else instead of an else-if,
let's swap the arms of the if-statement.
This avoids an "if (!x) { foo(); } else { bar(); }" and replaces it with
the more readable "if (x) { bar(); } else { foo(); }".
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
commit-graph.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c
index acca753ce8..b2cf9ed9d5 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -2681,16 +2681,16 @@ static int verify_one_commit_graph(struct repository *r,
graph_report(_("commit-graph parent list for commit %s terminates early"),
oid_to_hex(&cur_oid));
- if (!commit_graph_generation_from_graph(graph_commit)) {
- if (generation_zero == GENERATION_NUMBER_EXISTS)
- graph_report(_("commit-graph has generation number zero for commit %s, but non-zero elsewhere"),
- oid_to_hex(&cur_oid));
- generation_zero = GENERATION_ZERO_EXISTS;
- } else {
+ if (commit_graph_generation_from_graph(graph_commit)) {
if (generation_zero == GENERATION_ZERO_EXISTS)
graph_report(_("commit-graph has non-zero generation number for commit %s, but zero elsewhere"),
oid_to_hex(&cur_oid));
generation_zero = GENERATION_NUMBER_EXISTS;
+ } else {
+ if (generation_zero == GENERATION_NUMBER_EXISTS)
+ graph_report(_("commit-graph has generation number zero for commit %s, but non-zero elsewhere"),
+ oid_to_hex(&cur_oid));
+ generation_zero = GENERATION_ZERO_EXISTS;
}
if (generation_zero == GENERATION_ZERO_EXISTS)
--
2.42.0.rc0.29.g00abebef8e
next prev parent reply other threads:[~2023-08-10 20:37 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-08 19:15 [RFC/PATCH] commit-graph: verify swapped zero/non-zero generation cases Jeff King
2023-08-10 16:00 ` Taylor Blau
2023-08-10 17:44 ` Taylor Blau
2023-08-10 20:37 ` [PATCH 0/4] commit-graph: fsck zero/non-zero generation number fixes Taylor Blau
2023-08-10 20:37 ` [PATCH 1/4] commit-graph: introduce `commit_graph_generation_from_graph()` Taylor Blau
2023-08-10 20:37 ` [PATCH 2/4] commit-graph: verify swapped zero/non-zero generation cases Taylor Blau
2023-08-10 21:36 ` Junio C Hamano
2023-08-11 15:01 ` Jeff King
2023-08-11 17:08 ` Taylor Blau
2023-08-10 20:37 ` [PATCH 3/4] t/t5318-commit-graph.sh: test generation zero transitions during fsck Taylor Blau
2023-08-10 20:37 ` Taylor Blau [this message]
2023-08-11 15:02 ` [PATCH 0/4] commit-graph: fsck zero/non-zero generation number fixes Jeff King
2023-08-11 17:05 ` [PATCH v2 0/5] " Taylor Blau
2023-08-11 17:05 ` [PATCH v2 1/5] commit-graph: introduce `commit_graph_generation_from_graph()` Taylor Blau
2023-08-11 17:05 ` [PATCH v2 2/5] commit-graph: verify swapped zero/non-zero generation cases Taylor Blau
2023-08-11 17:05 ` [PATCH v2 3/5] t/t5318-commit-graph.sh: test generation zero transitions during fsck Taylor Blau
2023-08-11 17:05 ` [PATCH v2 4/5] commit-graph: invert negated conditional, extract to function Taylor Blau
2023-08-11 17:05 ` [PATCH v2 5/5] commit-graph: avoid repeated mixed generation number warnings Taylor Blau
2023-08-11 17:58 ` [PATCH v2 0/5] commit-graph: fsck zero/non-zero generation number fixes Jeff King
2023-08-11 19:28 ` Junio C Hamano
2023-08-17 19:51 ` Jeff King
2023-08-21 21:25 ` Taylor Blau
2023-08-21 21:34 ` [PATCH v3 0/4] " Taylor Blau
2023-08-21 21:34 ` [PATCH v3 1/4] commit-graph: introduce `commit_graph_generation_from_graph()` Taylor Blau
2023-08-21 21:34 ` [PATCH v3 2/4] commit-graph: verify swapped zero/non-zero generation cases Taylor Blau
2023-08-21 21:34 ` [PATCH v3 3/4] t/t5318-commit-graph.sh: test generation zero transitions during fsck Taylor Blau
2023-08-21 21:34 ` [PATCH v3 4/4] commit-graph: commit-graph: avoid repeated mixed generation number warnings Taylor Blau
2023-08-21 21:55 ` [PATCH v3 0/4] commit-graph: fsck zero/non-zero generation number fixes Jeff King
2023-08-21 23:22 ` Junio C Hamano
2023-08-23 19:59 ` Taylor Blau
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6ea610f7d2faf77d1984d641d1b857a9c4b1214d.1691699851.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).