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 /builtin/commit.c | |
| parent | 7b029ebaefd945b2315281fcdf9c35843641623b (diff) | |
| parent | a7df60cac834cb7f91c3463205c2b6ba5e694200 (diff) | |
| download | git-53c3be2c29b97a68145d42b413df2f8c070a2084.tar.gz | |
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 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index c70ad01cc9..7ba33a3bec 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1693,7 +1693,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) "not exceeded, and then \"git restore --staged :/\" to recover.")); if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - write_commit_graph_reachable(get_object_directory(), 0, NULL)) + write_commit_graph_reachable(the_repository->objects->odb, 0, NULL)) return 1; repo_rerere(the_repository, 0); |