mirror of
https://github.com/git/git.git
synced 2024-10-19 21:08:12 +02:00
a7df60cac8
Apply a similar treatment as in the previous patch to pass a 'struct object_directory *' through the 'load_commit_graph_one_fd_st' initializer, too. This prevents a potential bug where a pointer comparison is made to a NULL 'g->odb', which would cause the commit-graph machinery to think that a pair of commit-graphs belonged to different alternates when in fact they do not (i.e., in the case of no '--object-dir'). Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
54 lines
1.2 KiB
C
54 lines
1.2 KiB
C
#include "test-tool.h"
|
|
#include "cache.h"
|
|
#include "commit-graph.h"
|
|
#include "repository.h"
|
|
#include "object-store.h"
|
|
|
|
int cmd__read_graph(int argc, const char **argv)
|
|
{
|
|
struct commit_graph *graph = NULL;
|
|
char *graph_name;
|
|
int open_ok;
|
|
int fd;
|
|
struct stat st;
|
|
struct object_directory *odb;
|
|
|
|
setup_git_directory();
|
|
odb = the_repository->objects->odb;
|
|
|
|
graph_name = get_commit_graph_filename(odb);
|
|
|
|
open_ok = open_commit_graph(graph_name, &fd, &st);
|
|
if (!open_ok)
|
|
die_errno(_("Could not open commit-graph '%s'"), graph_name);
|
|
|
|
graph = load_commit_graph_one_fd_st(fd, &st, odb);
|
|
if (!graph)
|
|
return 1;
|
|
|
|
FREE_AND_NULL(graph_name);
|
|
|
|
printf("header: %08x %d %d %d %d\n",
|
|
ntohl(*(uint32_t*)graph->data),
|
|
*(unsigned char*)(graph->data + 4),
|
|
*(unsigned char*)(graph->data + 5),
|
|
*(unsigned char*)(graph->data + 6),
|
|
*(unsigned char*)(graph->data + 7));
|
|
printf("num_commits: %u\n", graph->num_commits);
|
|
printf("chunks:");
|
|
|
|
if (graph->chunk_oid_fanout)
|
|
printf(" oid_fanout");
|
|
if (graph->chunk_oid_lookup)
|
|
printf(" oid_lookup");
|
|
if (graph->chunk_commit_data)
|
|
printf(" commit_metadata");
|
|
if (graph->chunk_extra_edges)
|
|
printf(" extra_edges");
|
|
printf("\n");
|
|
|
|
UNLEAK(graph);
|
|
|
|
return 0;
|
|
}
|