From: Usman Akinyemi Date: Thu, 15 Oct 2026 16:59:20 GMT Subject: Re: [Outreachy PATCH] merge: stop using the_repository Message-ID: In-Reply-To: <20261015142532.48175-1-okhuomonajayi54@gmail.com> > > try_merge_command() and checkout_fast_forward() already receive a > repository, so use it instead of relying on global variables. > > Add a repository parameter to merge_argument() and pass it > from try_merge_command(). Use the repository in > checkout_fast_forward() when parsing trees. > > Remove the now-unnecessary USE_THE_REPOSITORY_VARIABLE > definition. > > Signed-off-by: Okhuomon Ajayi Good catch. > --- > merge.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > + strvec_push(&cmd.args, merge_argument(r, j->item)); > strvec_push(&cmd.args, "--"); > strvec_push(&cmd.args, head_arg); > for (j = remotes; j; j = j->next) > - strvec_push(&cmd.args, merge_argument(j->item)); > + strvec_push(&cmd.args, merge_argument(r, j->item)); > > cmd.git_cmd = 1; > ret = run_command(&cmd); > @@ -68,18 +66,18 @@ int checkout_fast_forward(struct repository *r, > memset(&trees, 0, sizeof(trees)); > memset(&t, 0, sizeof(t)); > } > for (i = 0; i < nr_trees; i++) { > - if (repo_parse_tree(the_repository, trees[i]) < 0) { > + if (repo_parse_tree(r, trees[i]) < 0) { > rollback_lock_file(&lock_file); > return -1; > } > -- > 2.54.0 > looks good to me.