diff options
author | Taylor Blau <me@ttaylorr.com> | 2020-02-04 00:18:00 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-04 22:36:51 +0300 |
commit | 13c249924995d504001eb8083fac106041b32f98 (patch) | |
tree | 124fa563e1c9ed159af34bb8f55255d64f05bed7 /builtin/commit-graph.c | |
parent | 0bd52e27e315a76d6950fa30ce602eef15d90571 (diff) |
commit-graph.h: store object directory in 'struct commit_graph'
In a previous patch, the 'char *object_dir' in 'struct commit_graph' was
replaced with a 'struct object_directory'. This patch applies the same
treatment to 'struct commit_graph', which is another intermediate step
towards getting rid of all path normalization in 'commit-graph.c'.
Instead of taking a 'char *object_dir', functions that construct a
'struct commit_graph' now take a 'struct object_directory *'. Any code
that needs an object directory path use '->path' instead.
This ensures that all calls to functions that perform path normalization
are given arguments which do not themselves require normalization. This
prepares those functions to drop their normalization entirely, which
will occur in the subsequent patch.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-graph.c')
-rw-r--r-- | builtin/commit-graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 20a3d31b76..5d8fa9dc2d 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -98,7 +98,7 @@ static int graph_verify(int argc, const char **argv) if (open_ok) graph = load_commit_graph_one_fd_st(fd, &st); else - graph = read_commit_graph_one(the_repository, odb->path); + graph = read_commit_graph_one(the_repository, odb); /* Return failure if open_ok predicted success */ if (!graph) |