2019-11-12 16:58:20 +00:00
|
|
|
#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;
|
commit-graph.c: remove path normalization, comparison
As of the previous patch, all calls to 'commit-graph.c' functions which
perform path normalization (for e.g., 'get_commit_graph_filename()') are
of the form 'ctx->odb->path', which is always in normalized form.
Now that there are no callers passing non-normalized paths to these
functions, ensure that future callers are bound by the same restrictions
by making these functions take a 'struct object_directory *' instead of
a 'const char *'. To match, replace all calls with arguments of the form
'ctx->odb->path' with 'ctx->odb' To recover the path, functions that
perform path manipulation simply use 'odb->path'.
Further, avoid string comparisons with arguments of the form
'odb->path', and instead prefer raw pointer comparisons, which
accomplish the same effect, but are far less brittle.
This has a pleasant side-effect of making these functions much more
robust to paths that cannot be normalized by 'normalize_path_copy()',
i.e., because they are outside of the current working directory.
For example, prior to this patch, Valgrind reports that the following
uninitialized memory read [1]:
$ ( cd t && GIT_DIR=../.git valgrind git rev-parse HEAD^ )
because 'normalize_path_copy()' can't normalize '../.git' (since it's
relative to but above of the current working directory) [2].
By using a 'struct object_directory *' directly,
'get_commit_graph_filename()' does not need to normalize, because all
paths are relative to the current working directory since they are
always read from the '->path' of an object directory.
[1]: https://lore.kernel.org/git/20191027042116.GA5801@sigill.intra.peff.net.
[2]: The bug here is that 'get_commit_graph_filename()' returns the
result of 'normalize_path_copy()' without checking the return
value.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-03 21:18:02 +00:00
|
|
|
struct object_directory *odb;
|
2019-11-12 16:58:20 +00:00
|
|
|
|
|
|
|
|
setup_git_directory();
|
commit-graph.c: remove path normalization, comparison
As of the previous patch, all calls to 'commit-graph.c' functions which
perform path normalization (for e.g., 'get_commit_graph_filename()') are
of the form 'ctx->odb->path', which is always in normalized form.
Now that there are no callers passing non-normalized paths to these
functions, ensure that future callers are bound by the same restrictions
by making these functions take a 'struct object_directory *' instead of
a 'const char *'. To match, replace all calls with arguments of the form
'ctx->odb->path' with 'ctx->odb' To recover the path, functions that
perform path manipulation simply use 'odb->path'.
Further, avoid string comparisons with arguments of the form
'odb->path', and instead prefer raw pointer comparisons, which
accomplish the same effect, but are far less brittle.
This has a pleasant side-effect of making these functions much more
robust to paths that cannot be normalized by 'normalize_path_copy()',
i.e., because they are outside of the current working directory.
For example, prior to this patch, Valgrind reports that the following
uninitialized memory read [1]:
$ ( cd t && GIT_DIR=../.git valgrind git rev-parse HEAD^ )
because 'normalize_path_copy()' can't normalize '../.git' (since it's
relative to but above of the current working directory) [2].
By using a 'struct object_directory *' directly,
'get_commit_graph_filename()' does not need to normalize, because all
paths are relative to the current working directory since they are
always read from the '->path' of an object directory.
[1]: https://lore.kernel.org/git/20191027042116.GA5801@sigill.intra.peff.net.
[2]: The bug here is that 'get_commit_graph_filename()' returns the
result of 'normalize_path_copy()' without checking the return
value.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-03 21:18:02 +00:00
|
|
|
odb = the_repository->objects->odb;
|
2019-11-12 16:58:20 +00:00
|
|
|
|
commit-graph.c: remove path normalization, comparison
As of the previous patch, all calls to 'commit-graph.c' functions which
perform path normalization (for e.g., 'get_commit_graph_filename()') are
of the form 'ctx->odb->path', which is always in normalized form.
Now that there are no callers passing non-normalized paths to these
functions, ensure that future callers are bound by the same restrictions
by making these functions take a 'struct object_directory *' instead of
a 'const char *'. To match, replace all calls with arguments of the form
'ctx->odb->path' with 'ctx->odb' To recover the path, functions that
perform path manipulation simply use 'odb->path'.
Further, avoid string comparisons with arguments of the form
'odb->path', and instead prefer raw pointer comparisons, which
accomplish the same effect, but are far less brittle.
This has a pleasant side-effect of making these functions much more
robust to paths that cannot be normalized by 'normalize_path_copy()',
i.e., because they are outside of the current working directory.
For example, prior to this patch, Valgrind reports that the following
uninitialized memory read [1]:
$ ( cd t && GIT_DIR=../.git valgrind git rev-parse HEAD^ )
because 'normalize_path_copy()' can't normalize '../.git' (since it's
relative to but above of the current working directory) [2].
By using a 'struct object_directory *' directly,
'get_commit_graph_filename()' does not need to normalize, because all
paths are relative to the current working directory since they are
always read from the '->path' of an object directory.
[1]: https://lore.kernel.org/git/20191027042116.GA5801@sigill.intra.peff.net.
[2]: The bug here is that 'get_commit_graph_filename()' returns the
result of 'normalize_path_copy()' without checking the return
value.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-03 21:18:02 +00:00
|
|
|
graph_name = get_commit_graph_filename(odb);
|
2019-11-12 16:58:20 +00:00
|
|
|
|
|
|
|
|
open_ok = open_commit_graph(graph_name, &fd, &st);
|
|
|
|
|
if (!open_ok)
|
|
|
|
|
die_errno(_("Could not open commit-graph '%s'"), graph_name);
|
|
|
|
|
|
2020-02-03 21:18:04 +00:00
|
|
|
graph = load_commit_graph_one_fd_st(fd, &st, odb);
|
2019-11-12 16:58:20 +00:00
|
|
|
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;
|
|
|
|
|
}
|