mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit-graph: don't pass filename to load_commit_graph_one_fd_st()

Browse Source 
An earlier change implemented load_commit_graph_one_fd_st() in a way
that was bug-compatible with earlier code in terms of the "graph file
%s is too small" error message printing out the path to the
commit-graph (".git/objects/info/commit-graph").

But change that, because:

 * A function that takes an already-open file descriptor also needing
   the filename isn't very intuitive.

 * The vast majority of errors we might emit when loading the graph
   come from parse_commit_graph(), which doesn't report the
   filename. Let's not do that either in this case for consistency.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2019-03-25 13:08:31 +01:00
committed by Junio C Hamano
parent 61df89c8e5
commit 67a530fab3
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/commit-graph.c
View File

@ -64,7 +64,7 @@ static int graph_verify(int argc, const char **argv)
open_ok = open_commit_graph(graph_name, &fd, &st);
if (!open_ok)
return 0;
graph = load_commit_graph_one_fd_st(graph_name, fd, &st);
graph = load_commit_graph_one_fd_st(fd, &st);
FREE_AND_NULL(graph_name);
if (!graph)
@ -102,7 +102,7 @@ static int graph_read(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(graph_name, fd, &st);
graph = load_commit_graph_one_fd_st(fd, &st);
if (!graph)
return 1;