summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2020-02-03 21:18:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-04 19:36:51 (GMT)
commita7df60cac834cb7f91c3463205c2b6ba5e694200 (patch)
treef01d5060ce47a0e049a520a72c105a367f13cbde /t/helper
parentad2dd5bb63b6c2da0091d63463e29ae27e47a893 (diff)
downloadgit-a7df60cac834cb7f91c3463205c2b6ba5e694200.zip
git-a7df60cac834cb7f91c3463205c2b6ba5e694200.tar.gz
git-a7df60cac834cb7f91c3463205c2b6ba5e694200.tar.bz2
commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
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>
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-read-graph.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c
index 2c2f65f..f8a4617 100644
--- a/t/helper/test-read-graph.c
+++ b/t/helper/test-read-graph.c
@@ -22,7 +22,7 @@ int cmd__read_graph(int argc, const char **argv)
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;