diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-17 09:27:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-17 09:27:08 -0700 |
| commit | e2889596bed4482c1b5ceaf3947d1aa01222b51e (patch) | |
| tree | b64781b4b57d091063149d5333d5261f1dd6a2c5 /builtin/merge.c | |
| parent | Merge branch 'ds/doc-count-objects-fix' into next (diff) | |
| parent | commit-graph: stop passing in redundant repository (diff) | |
| download | git-e2889596bed4482c1b5ceaf3947d1aa01222b51e.tar.gz git-e2889596bed4482c1b5ceaf3947d1aa01222b51e.zip | |
Merge branch 'ps/commit-graph-wo-globals' into next
Remove dependency on the_repository and other globals from the
commit-graph code, and other changes unrelated to de-globaling.
* ps/commit-graph-wo-globals:
commit-graph: stop passing in redundant repository
commit-graph: stop using `the_repository`
commit-graph: stop using `the_hash_algo`
commit-graph: refactor `parse_commit_graph()` to take a repository
commit-graph: store the hash algorithm instead of its length
commit-graph: stop using `the_hash_algo` via macros
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 783ca66377..b235af730a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1863,7 +1863,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); |