diff options
| author | Taylor Blau <me@ttaylorr.com> | 2020-04-14 04:04:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-15 16:20:24 (GMT) |
| commit | 2fa05f31bd95eed34d6e8848b6b1e6265674f50a (patch) | |
| tree | 3937e5487f27e6bcfdf326850ea6b7b368843d00 /t/helper/test-read-graph.c | |
| parent | a7df60cac834cb7f91c3463205c2b6ba5e694200 (diff) | |
| download | git-2fa05f31bd95eed34d6e8848b6b1e6265674f50a.zip git-2fa05f31bd95eed34d6e8848b6b1e6265674f50a.tar.gz git-2fa05f31bd95eed34d6e8848b6b1e6265674f50a.tar.bz2 | |
t/helper/test-read-graph.c: support commit-graph chains
In 61df89c8e5 (commit-graph: don't early exit(1) on e.g. "git status",
2019-03-25), the former 'load_commit_graph_one' was refactored into
'open_commit_graph' and 'load_commit_graph_one_fd_st' as a means of
avoiding an early-exit from non-library code.
However, 'load_commit_graph_one' does not support commit-graph chains,
and hence the 'read-graph' test tool does not work with them.
Replace 'load_commit_graph_one' with 'read_commit_graph_one' in order to
support commit-graph chains. In the spirit of 61df89c8e5,
'read_commit_graph_one' does not ever 'die()', making it a suitable
replacement here.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper/test-read-graph.c')
| -rw-r--r-- | t/helper/test-read-graph.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c index f8a4617..4846040 100644 --- a/t/helper/test-read-graph.c +++ b/t/helper/test-read-graph.c @@ -7,26 +7,15 @@ 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); + graph = read_commit_graph_one(the_repository, odb); if (!graph) return 1; - FREE_AND_NULL(graph_name); printf("header: %08x %d %d %d %d\n", ntohl(*(uint32_t*)graph->data), |