Derrick Stolee <dstolee@xxxxxxxxxxxxx> writes:
> If the commit-graph file becomes corrupt, we need a way to verify
> that its contents match the object database. In the manner of
> 'git fsck' we will implement a 'git commit-graph verify' subcommand
> to report all issues with the file.
>
> Add the 'verify' subcommand to the 'commit-graph' builtin and its
> documentation. The subcommand is currently a no-op except for
> loading the commit-graph into memory, which may trigger run-time
> errors that would be caught by normal use. Add a simple test that
> ensures the command returns a zero error code.
>
> If no commit-graph file exists, this is an acceptable state. Do
> not report any errors.
All right. Nice introductory patch.
>
> During review, we noticed that a FREE_AND_NULL(graph_name) was
> placed after a possible 'return', and this pattern was also in
> graph_read(). Fix that case, too.
This should probably be a separate [micro-]patch. Especially as Martin
Ågren noticed it is not correct...
>
> Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
> ---
> Documentation/git-commit-graph.txt | 6 ++++++
> builtin/commit-graph.c | 40 +++++++++++++++++++++++++++++++++++++-
> commit-graph.c | 5 +++++
> commit-graph.h | 2 ++
> t/t5318-commit-graph.sh | 10 ++++++++++
> 5 files changed, 62 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt
> index 4c97b555cc..a222cfab08 100644
> --- a/Documentation/git-commit-graph.txt
> +++ b/Documentation/git-commit-graph.txt
> @@ -10,6 +10,7 @@ SYNOPSIS
> --------
> [verse]
> 'git commit-graph read' [--object-dir <dir>]
> +'git commit-graph verify' [--object-dir <dir>]
> 'git commit-graph write' <options> [--object-dir <dir>]
>
>
> @@ -52,6 +53,11 @@ existing commit-graph file.
> Read a graph file given by the commit-graph file and output basic
> details about the graph file. Used for debugging purposes.
>
> +'verify'::
> +
> +Read the commit-graph file and verify its contents against the object
> +database. Used to check for corrupted data.
I wonder if it would be useful to have an option to verify commit-graph
file without accessing the object database, checking just that it is
well formed.
Anyway, it could be added later, if needed.
> +
>
> EXAMPLES
> --------
> diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
> index 37420ae0fd..af3101291f 100644
> --- a/builtin/commit-graph.c
> +++ b/builtin/commit-graph.c
> @@ -8,10 +8,16 @@
> static char const * const builtin_commit_graph_usage[] = {
> N_("git commit-graph [--object-dir <objdir>]"),
> N_("git commit-graph read [--object-dir <objdir>]"),
> + N_("git commit-graph verify [--object-dir <objdir>]"),
> N_("git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--stdin-commits]"),
> NULL
> };
>
> +static const char * const builtin_commit_graph_verify_usage[] = {
> + N_("git commit-graph verify [--object-dir <objdir>]"),
> + NULL
> +};
> +
> static const char * const builtin_commit_graph_read_usage[] = {
> N_("git commit-graph read [--object-dir <objdir>]"),
> NULL
> @@ -29,6 +35,36 @@ static struct opts_commit_graph {
> int append;
> } opts;
>
> +
> +static int graph_verify(int argc, const char **argv)
A reminder for myself: exit code 0 means no errors.
> +{
> + struct commit_graph *graph = 0;
> + char *graph_name;
> +
> + static struct option builtin_commit_graph_verify_options[] = {
> + OPT_STRING(0, "object-dir", &opts.obj_dir,
> + N_("dir"),
> + N_("The object directory to store the graph")),
> + OPT_END(),
> + };
> +
> + argc = parse_options(argc, argv, NULL,
> + builtin_commit_graph_verify_options,
> + builtin_commit_graph_verify_usage, 0);
> +
> + if (!opts.obj_dir)
> + opts.obj_dir = get_object_directory();
All right, simple handling of a subcommand and its options.
I still think that '--object-dir=<path>' should be a git wrapper option,
like '--git-dir=<path>' and '--work-tree=<path>' (and
'--namespace=<path>') are. It would be command-line option equivalent
to the GIT_OBJECT_DIRECTORY environment variable, just like
--git-dir=<path> is for GIT_DIR, and --work-tree=<path> is for
GIT_WORK_TREE, etc.
This way the code would be implemented once for all commands, and there
would be no duplicated code for each git-commit-graph subcommand.
But that may be a matter of a separate patch.
> +
> + graph_name = get_commit_graph_filename(opts.obj_dir);
This returns full path of commit-graph file, allocating it.
> + graph = load_commit_graph_one(graph_name);
This reads the file (no checking if core.commitGraph is set, no handling
of alternatives), and verifies that:
- file is not too small, i.e. smaller than GRAPH_MIN_SIZE
- it has correct signature
- it has correct graph version
- it has correct hash version
- chunk [offsets] fit within file
- that OID Fanout, OID Lookup, Commit Data and Large Edges chunks are
not repeated, though not that all required chunks are present
> + FREE_AND_NULL(graph_name);
All right, graph_name is not used further, so we free it and set it to
NULL.
Note however that if load_commit_graph_one() finds errors, it would exit
with error code 1... but then exiting the process would free its
resources anyway.
> +
> + if (!graph)
> + return 0;
The only case where load_commit_graph_one() returns NULL instead of
exiting is if the file cannot be opened for reading (e.g. it does not
exists, or cannot be opened for reading), or its status cannot be read.
Side question: this is nice defensive programming, but could it happen
that file can be opened for reading, but its status cannot be read?
> +
> + return verify_commit_graph(graph);
Here we leak graph->fd (it is neither unmapped, nor closed) but that may
not matter as we are exiting anyway. Well, at least until it gets
libified, then maybe.
> +}
> +
> static int graph_read(int argc, const char **argv)
> {
> struct commit_graph *graph = NULL;
> @@ -50,10 +86,10 @@ static int graph_read(int argc, const char **argv)
>
> graph_name = get_commit_graph_filename(opts.obj_dir);
> graph = load_commit_graph_one(graph_name);
> + FREE_AND_NULL(graph_name);
>
> if (!graph)
> die("graph file %s does not exist", graph_name);
> - FREE_AND_NULL(graph_name);
Here we use graph_name, which has been just freed and set to NULL.
This should probably be (but I may be wrong):
if (!graph) {
UNLEAK(graph_name);
die("graph file %s does not exist", graph_name);
}
FREE_AND_NULL(graph_name);
>
> printf("header: %08x %d %d %d %d\n",
> ntohl(*(uint32_t*)graph->data),
> @@ -160,6 +196,8 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix)
> PARSE_OPT_STOP_AT_NON_OPTION);
>
> if (argc > 0) {
> + if (!strcmp(argv[0], "verify"))
> + return graph_verify(argc, argv);
> if (!strcmp(argv[0], "read"))
> return graph_read(argc, argv);
> if (!strcmp(argv[0], "write"))
All right, straightforward adding of a new subcommand.
> diff --git a/commit-graph.c b/commit-graph.c
> index a8c337dd77..b25aaed128 100644
> --- a/commit-graph.c
> +++ b/commit-graph.c
> @@ -817,3 +817,8 @@ void write_commit_graph(const char *obj_dir,
> oids.alloc = 0;
> oids.nr = 0;
> }
> +
> +int verify_commit_graph(struct commit_graph *g)
> +{
> + return !g;
> +}
All right, nice placeholder.
> diff --git a/commit-graph.h b/commit-graph.h
> index 96cccb10f3..71a39c5a57 100644
> --- a/commit-graph.h
> +++ b/commit-graph.h
> @@ -53,4 +53,6 @@ void write_commit_graph(const char *obj_dir,
> int nr_commits,
> int append);
>
> +int verify_commit_graph(struct commit_graph *g);
> +
> #endif
> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
> index 77d85aefe7..6ca451dfd2 100755
> --- a/t/t5318-commit-graph.sh
> +++ b/t/t5318-commit-graph.sh
> @@ -11,6 +11,11 @@ test_expect_success 'setup full repo' '
> objdir=".git/objects"
> '
>
> +test_expect_success 'verify graph with no graph file' '
> + cd "$TRASH_DIRECTORY/full" &&
> + git commit-graph verify
> +'
Nice to have this test here, but as it is now it is not an independent
test. It depends on the fact that other earlier tests did not generate
graph file.
Perhaps it would be better to have a separate directory with repository
without commit graph file, and separate directory with repository with
commit graph file. Or rename commit graph file if it exists, renaming
it back after tests finishes. Or something like that.
> +
> test_expect_success 'write graph with no packs' '
> cd "$TRASH_DIRECTORY/full" &&
> git commit-graph write --object-dir . &&
> @@ -230,4 +235,9 @@ test_expect_success 'perform fast-forward merge in full repo' '
> test_cmp expect output
> '
>
> +test_expect_success 'git commit-graph verify' '
> + cd "$TRASH_DIRECTORY/full" &&
> + git commit-graph verify >output
> +'
This is amost the same tests as the one added earlier, the only
difference is its place in t/t5318-commit-graph.sh. This test is not
independent.
Though I'm not sure if that would matter much.
> +
> test_done
