merge-ort: replace the_repository with opt->repo
We have a perfectly valid repository available and do not need to use the_repository. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Feb 21, 2026 at 23:59 UTC
b54590b4634936ffc57a994d33ae053ccc7fcdfd
1 file changed
+21
-21
merge-ort.c
+21
-21
@@ -1732,9 +1732,9 @@ static int collect_merge_info(struct merge_options *opt,
1732
info.data = opt;
1733
info.show_all_errors = 1;
1734
1735
- if (repo_parse_tree(the_repository, merge_base) < 0 ||
1736
- repo_parse_tree(the_repository, side1) < 0 ||
1737
- repo_parse_tree(the_repository, side2) < 0)
1735
+ if (repo_parse_tree(opt->repo, merge_base) < 0 ||
1736
+ repo_parse_tree(opt->repo, side1) < 0 ||
1737
+ repo_parse_tree(opt->repo, side2) < 0)
1738
return -1;
1739
init_tree_desc(t + 0, &merge_base->object.oid,
1740
merge_base->buffer, merge_base->size);
@@ -2136,9 +2136,9 @@ static int merge_3way(struct merge_options *opt,
2136
name2 = mkpathdup("%s:%s", opt->branch2, pathnames[2]);
2137
}
2138
2139
- read_mmblob(&orig, the_repository->objects, o);
2140
- read_mmblob(&src1, the_repository->objects, a);
2141
- read_mmblob(&src2, the_repository->objects, b);
2139
+ read_mmblob(&orig, opt->repo->objects, o);
2140
+ read_mmblob(&src1, opt->repo->objects, a);
2141
+ read_mmblob(&src2, opt->repo->objects, b);
2142
2143
merge_status = ll_merge(result_buf, path, &orig, base,
2144
&src1, name1, &src2, name2,
@@ -2254,7 +2254,7 @@ static int handle_content_merge(struct merge_options *opt,
2254
}
2255
2256
if (!ret && record_object &&
2257
- odb_write_object(the_repository->objects, result_buf.ptr, result_buf.size,
2257
+ odb_write_object(opt->repo->objects, result_buf.ptr, result_buf.size,
2258
OBJ_BLOB, &result->oid)) {
2259
path_msg(opt, ERROR_OBJECT_WRITE_FAILED, 0,
2260
pathnames[0], pathnames[1], pathnames[2], NULL,
@@ -3713,7 +3713,7 @@ static int read_oid_strbuf(struct merge_options *opt,
3713
void *buf;
3714
enum object_type type;
3715
unsigned long size;
3716
- buf = odb_read_object(the_repository->objects, oid, &type, &size);
3716
+ buf = odb_read_object(opt->repo->objects, oid, &type, &size);
3717
if (!buf) {
3718
path_msg(opt, ERROR_OBJECT_READ_FAILED, 0,
3719
path, NULL, NULL, NULL,
@@ -4619,10 +4619,10 @@ static int checkout(struct merge_options *opt,
4619
unpack_opts.verbose_update = (opt->verbosity > 2);
4620
unpack_opts.fn = twoway_merge;
4621
unpack_opts.preserve_ignored = 0; /* FIXME: !opts->overwrite_ignore */
4622
- if (repo_parse_tree(the_repository, prev) < 0)
4622
+ if (repo_parse_tree(opt->repo, prev) < 0)
4623
return -1;
4624
init_tree_desc(&trees[0], &prev->object.oid, prev->buffer, prev->size);
4625
- if (repo_parse_tree(the_repository, next) < 0)
4625
+ if (repo_parse_tree(opt->repo, next) < 0)
4626
return -1;
4627
init_tree_desc(&trees[1], &next->object.oid, next->buffer, next->size);
4628
@@ -5280,7 +5280,7 @@ redo:
5280
5281
if (result->clean >= 0) {
5282
if (!opt->mergeability_only) {
5283
- result->tree = repo_parse_tree_indirect(the_repository,
5283
+ result->tree = repo_parse_tree_indirect(opt->repo,
5284
&working_tree_oid);
5285
if (!result->tree)
5286
die(_("unable to read tree (%s)"),
@@ -5309,7 +5309,7 @@ static void merge_ort_internal(struct merge_options *opt,
5309
struct strbuf merge_base_abbrev = STRBUF_INIT;
5310
5311
if (!merge_bases) {
5312
- if (repo_get_merge_bases(the_repository, h1, h2,
5312
+ if (repo_get_merge_bases(opt->repo, h1, h2,
5313
&merge_bases) < 0) {
5314
result->clean = -1;
5315
goto out;
@@ -5440,20 +5440,20 @@ static void merge_recursive_config(struct merge_options *opt, int ui)
5440
{
5441
char *value = NULL;
5442
int renormalize = 0;
5443
- repo_config_get_int(the_repository, "merge.verbosity", &opt->verbosity);
5444
- repo_config_get_int(the_repository, "diff.renamelimit", &opt->rename_limit);
5445
- repo_config_get_int(the_repository, "merge.renamelimit", &opt->rename_limit);
5446
- repo_config_get_bool(the_repository, "merge.renormalize", &renormalize);
5443
+ repo_config_get_int(opt->repo, "merge.verbosity", &opt->verbosity);
5444
+ repo_config_get_int(opt->repo, "diff.renamelimit", &opt->rename_limit);
5445
+ repo_config_get_int(opt->repo, "merge.renamelimit", &opt->rename_limit);
5446
+ repo_config_get_bool(opt->repo, "merge.renormalize", &renormalize);
5447
opt->renormalize = renormalize;
5448
- if (!repo_config_get_string(the_repository, "diff.renames", &value)) {
5448
+ if (!repo_config_get_string(opt->repo, "diff.renames", &value)) {
5449
opt->detect_renames = git_config_rename("diff.renames", value);
5450
free(value);
5451
}
5452
- if (!repo_config_get_string(the_repository, "merge.renames", &value)) {
5452
+ if (!repo_config_get_string(opt->repo, "merge.renames", &value)) {
5453
opt->detect_renames = git_config_rename("merge.renames", value);
5454
free(value);
5455
}
5456
- if (!repo_config_get_string(the_repository, "merge.directoryrenames", &value)) {
5456
+ if (!repo_config_get_string(opt->repo, "merge.directoryrenames", &value)) {
5457
int boolval = git_parse_maybe_bool(value);
5458
if (0 <= boolval) {
5459
opt->detect_directory_renames = boolval ?
@@ -5466,7 +5466,7 @@ static void merge_recursive_config(struct merge_options *opt, int ui)
5466
free(value);
5467
}
5468
if (ui) {
5469
- if (!repo_config_get_string(the_repository, "diff.algorithm", &value)) {
5469
+ if (!repo_config_get_string(opt->repo, "diff.algorithm", &value)) {
5470
long diff_algorithm = parse_algorithm_value(value);
5471
if (diff_algorithm < 0)
5472
die(_("unknown value for config '%s': %s"), "diff.algorithm", value);
@@ -5474,7 +5474,7 @@ static void merge_recursive_config(struct merge_options *opt, int ui)
5474
free(value);
5475
}
5476
}
5477
- repo_config(the_repository, git_xmerge_config, NULL);
5477
+ repo_config(opt->repo, git_xmerge_config, NULL);
5478
}
5479
5480
static void init_merge_options(struct merge_options *opt,