diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:24 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:24 -0800 |
commit | 53c3be2c29b97a68145d42b413df2f8c070a2084 (patch) | |
tree | 18f6572a288c4146d21149fe935810dcd41083d3 /t/helper | |
parent | Merge branch 'jk/index-pack-dupfix' (diff) | |
parent | commit-graph.h: use odb in 'load_commit_graph_one_fd_st' (diff) | |
download | tgif-53c3be2c29b97a68145d42b413df2f8c070a2084.tar.xz |
Merge branch 'tb/commit-graph-object-dir'
The code to compute the commit-graph has been taught to use a more
robust way to tell if two object directories refer to the same
thing.
* tb/commit-graph-object-dir:
commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
commit-graph.c: remove path normalization, comparison
commit-graph.h: store object directory in 'struct commit_graph'
commit-graph.h: store an odb in 'struct write_commit_graph_context'
t5318: don't pass non-object directory to '--object-dir'
Diffstat (limited to 't/helper')
-rw-r--r-- | t/helper/test-read-graph.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c index d2884efe0a..f8a461767c 100644 --- a/t/helper/test-read-graph.c +++ b/t/helper/test-read-graph.c @@ -11,18 +11,18 @@ int cmd__read_graph(int argc, const char **argv) int open_ok; int fd; struct stat st; - const char *object_dir; + struct object_directory *odb; setup_git_directory(); - object_dir = get_object_directory(); + odb = the_repository->objects->odb; - graph_name = get_commit_graph_filename(object_dir); + 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); + graph = load_commit_graph_one_fd_st(fd, &st, odb); if (!graph) return 1; |