From: Patrick Steinhardt Date: Wed, 04 Nov 2026 15:57:29 GMT Subject: [PATCH 07/10] commit-graph: fix mixup of write/verify flags Message-ID: <20261104-pks-commit-graph-write-refactorings-v1-7-d013d9401a59@pks.im> In-Reply-To: <20261104-pks-commit-graph-write-refactorings-v1-0-d013d9401a59@pks.im> While we already have flags specific to `verify_commit_graph()`, the function also uses `COMMIT_GRAPH_WRITE_PROGRESS`. This mixup is a bit of a footgun though, as it may easily happen that the value of that flag is the exact same value as a future `COMMIT_GRAPH_VERIFY_*` flag. Fix this mixup by introducing a new `COMMIT_GRAPH_VERIFY_PROGRESS` flag. While at it, convert the verify flags into an enum. Signed-off-by: Patrick Steinhardt --- builtin/commit-graph.c | 4 ++-- commit-graph.c | 5 +++-- commit-graph.h | 8 ++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index f2c374d0176..09b09d6ac5c 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -70,9 +70,9 @@ static int cmd_commit_graph_verify(int argc, char *graph_name; char *chain_name; enum { OPENED_NONE, OPENED_GRAPH, OPENED_CHAIN } opened = OPENED_NONE; + enum commit_graph_verify_flags flags = 0; int fd; struct stat st; - int flags = 0; int incomplete_chain = 0; int ret; struct option options[] = { @@ -97,7 +97,7 @@ static int cmd_commit_graph_verify(int argc, if (opts.shallow) flags |= COMMIT_GRAPH_VERIFY_SHALLOW; if (opts.progress) - flags |= COMMIT_GRAPH_WRITE_PROGRESS; + flags |= COMMIT_GRAPH_VERIFY_PROGRESS; dir = odb_source_files_find_dir(repo->objects, opts.obj_dir); if (!dir) diff --git a/commit-graph.c b/commit-graph.c index 077213b5336..c82776b0667 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -2904,7 +2904,8 @@ static int verify_one_commit_graph(struct commit_graph *g, return verify_commit_graph_error; } -int verify_commit_graph(struct commit_graph *g, int flags) +int verify_commit_graph(struct commit_graph *g, + enum commit_graph_verify_flags flags) { struct progress *progress = NULL; int local_error = 0; @@ -2915,7 +2916,7 @@ int verify_commit_graph(struct commit_graph *g, int flags) return 1; } - if (flags & COMMIT_GRAPH_WRITE_PROGRESS) { + if (flags & COMMIT_GRAPH_VERIFY_PROGRESS) { uint64_t total = g->num_commits; if (!(flags & COMMIT_GRAPH_VERIFY_SHALLOW)) total += g->num_commits_in_base; diff --git a/commit-graph.h b/commit-graph.h index 0e03e82a04a..80d59bd23bd 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -199,9 +199,13 @@ int write_commit_graph(struct repository *r, const char *dir, const struct commit_graph_write_options *opts); -#define COMMIT_GRAPH_VERIFY_SHALLOW (1 << 0) +enum commit_graph_verify_flags { + COMMIT_GRAPH_VERIFY_SHALLOW = (1 << 0), + COMMIT_GRAPH_VERIFY_PROGRESS = (1 << 1), +}; -int verify_commit_graph(struct commit_graph *g, int flags); +int verify_commit_graph(struct commit_graph *g, + enum commit_graph_verify_flags flags); void close_commit_graph(struct object_database *); void free_commit_graph(struct commit_graph *); -- 2.56.0.500.g5d06dc02cd.dirty