aboutsummaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2026-01-09 22:30:21 +0100
committerJunio C Hamano <gitster@pobox.com>2026-01-09 18:36:18 -0800
commitec7a16b14551fed736ecfe0a9d4f6d6f9e03be79 (patch)
tree879e793cbcd59b52d7e3527b6e1db035ef7977d0 /sequencer.c
parenta8a50f29aeab6cf3cd848caaa8229ab26d542b80 (diff)
downloadgit-ec7a16b14551fed736ecfe0a9d4f6d6f9e03be79.tar.xz
cocci: convert parse_tree functions to repo_ variants
Add and apply a semantic patch to convert calls to parse_tree() and friends to the corresponding variant that takes a repository argument, to allow the functions that implicitly use the_repository to be retired once all potential in-flight topics are settled and converted as well. The changes in .c files were generated by Coccinelle, but I fixed a whitespace bug it would have introduced to builtin/commit.c. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c
index 71ed31c774..cccde58bee 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -767,7 +767,7 @@ static int do_recursive_merge(struct repository *r,
o.buffer_output = 2;
o.show_rename_progress = 1;
- head_tree = parse_tree_indirect(head);
+ head_tree = repo_parse_tree_indirect(the_repository, head);
if (!head_tree)
return error(_("unable to read tree (%s)"), oid_to_hex(head));
next_tree = next ? repo_get_commit_tree(r, next) : empty_tree(r);
@@ -4052,7 +4052,7 @@ static int do_reset(struct repository *r,
goto cleanup;
}
- tree = parse_tree_indirect(&oid);
+ tree = repo_parse_tree_indirect(the_repository, &oid);
if (!tree)
return error(_("unable to read tree (%s)"), oid_to_hex(&oid));
prime_cache_tree(r, r->index, tree);