diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-08-15 07:49:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-15 09:34:48 -0700 |
| commit | ddacfc7466707cbe462594052261647b43868825 (patch) | |
| tree | 2721411718b1c8cd3cd6f4fc96337610bc73218e /builtin/merge.c | |
| parent | 89cc9b9adf31729c91aa94c178b44b45febd260f (diff) | |
commit-graph: stop using `the_repository`
There's still a bunch of uses of `the_repository` in "commit-graph.c",
which we want to stop using due to it being a global variable. Refactor
the code to stop using `the_repository` in favor of the repository
provided via the calling context.
This allows us to drop the `USE_THE_REPOSITORY_VARIABLE` macro.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index dc4cb8fb14..a62317f4fd 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1862,7 +1862,7 @@ int cmd_merge(int argc, if (squash) { finish(head_commit, remoteheads, NULL, NULL); - git_test_write_commit_graph_or_die(); + git_test_write_commit_graph_or_die(the_repository->objects->sources); } else write_merge_state(remoteheads); |