On Tue, Oct 10, 2023 at 04:33:33PM -0400, Taylor Blau wrote:
> Prepare for the 'read-graph' test helper to perform other tasks besides
> dumping high-level information about the commit-graph by extracting its
> main routine into a separate function.
>
> Signed-off-by: Taylor Blau <me@xxxxxxxxxxxx>
> Signed-off-by: Jonathan Tan <jonathantanmy@xxxxxxxxxx>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> Signed-off-by: Taylor Blau <me@xxxxxxxxxxxx>
Nit: your signoff is duplicated here. This is also still the case for
some of the other commits.
Patrick
> ---
> t/helper/test-read-graph.c | 31 ++++++++++++++++++-------------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c
> index 8c7a83f578..3375392f6c 100644
> --- a/t/helper/test-read-graph.c
> +++ b/t/helper/test-read-graph.c
> @@ -5,20 +5,8 @@
> #include "bloom.h"
> #include "setup.h"
>
> -int cmd__read_graph(int argc UNUSED, const char **argv UNUSED)
> +static void dump_graph_info(struct commit_graph *graph)
> {
> - struct commit_graph *graph = NULL;
> - struct object_directory *odb;
> -
> - setup_git_directory();
> - odb = the_repository->objects->odb;
> -
> - prepare_repo_settings(the_repository);
> -
> - graph = read_commit_graph_one(the_repository, odb);
> - if (!graph)
> - return 1;
> -
> printf("header: %08x %d %d %d %d\n",
> ntohl(*(uint32_t*)graph->data),
> *(unsigned char*)(graph->data + 4),
> @@ -57,6 +45,23 @@ int cmd__read_graph(int argc UNUSED, const char **argv UNUSED)
> if (graph->topo_levels)
> printf(" topo_levels");
> printf("\n");
> +}
> +
> +int cmd__read_graph(int argc UNUSED, const char **argv UNUSED)
> +{
> + struct commit_graph *graph = NULL;
> + struct object_directory *odb;
> +
> + setup_git_directory();
> + odb = the_repository->objects->odb;
> +
> + prepare_repo_settings(the_repository);
> +
> + graph = read_commit_graph_one(the_repository, odb);
> + if (!graph)
> + return 1;
> +
> + dump_graph_info(graph);
>
> UNLEAK(graph);
>
> --
> 2.42.0.342.g8bb3a896ee
>
Attachment:
signature.asc
Description: PGP signature
