From af5706f033466b2a4f17d83168bf0bd021197c1d Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Mon, 9 Feb 2026 20:24:52 +0100 Subject: xdiff-interface: stop using the_repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the algorithm-agnostic is_null_oid() and push the dependency of read_mmblob() on the_repository->objects to its callers. This allows it to be used with arbitrary object databases. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apply.c') diff --git a/apply.c b/apply.c index 3de4aa4d2e..ea90ed16be 100644 --- a/apply.c +++ b/apply.c @@ -3568,9 +3568,9 @@ static int three_way_merge(struct apply_state *state, else if (oideq(base, theirs) || oideq(ours, theirs)) return resolve_to(image, ours); - read_mmblob(&base_file, base); - read_mmblob(&our_file, ours); - read_mmblob(&their_file, theirs); + read_mmblob(&base_file, the_repository->objects, base); + read_mmblob(&our_file, the_repository->objects, ours); + read_mmblob(&their_file, the_repository->objects, theirs); merge_opts.variant = state->merge_variant; status = ll_merge(&result, path, &base_file, "base", -- cgit v1.3-6-g1900