[PATCH v2 1/2] merge-ours: drop USE_THE_REPOSITORY_VARIABLE

From: Sam Bostock via GitGitGadget <gitgitgadget@gmail.com>
Date: Feb 6, 2026, 19:16 UTC
Message-ID: <775d76df69c118e0dbf24522eb3e75f58d6e9240.1770405383.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.2189.v2.git.git.1770405383.gitgitgadget@gmail.com>

From: Sam Bostock <sam@sambostock.ca>

The merge-ours built-in uses the `the_repository` global to access the repository. The project is moving away from this global in favor of the `repo` parameter that is passed to each built-in command. Since merge-ours is registered with RUN_SETUP, `repo` is guaranteed to be non-NULL and can be used directly.

Drop the USE_THE_REPOSITORY_VARIABLE macro and use `repo` throughout.

While at it, remove a stray double blank line between the #include block and the usage string.

Signed-off-by: Sam Bostock <sam@sambostock.ca>
---
 builtin/merge-ours.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index 97b8a792c7..2312e58ab3 100644
--- a/builtin/merge-ours.c
+++ b/builtin/merge-ours.c
@@ -8,20 +8,17 @@
  * Pretend we resolved the heads, but declare our tree trumps everybody else.
  */
 
-#define USE_THE_REPOSITORY_VARIABLE
-
 #include "git-compat-util.h"
 #include "builtin.h"
 #include "diff.h"
 
-
 static const char builtin_merge_ours_usage[] =
 	"git merge-ours <base>... -- HEAD <remote>...";
 
 int cmd_merge_ours(int argc,
 		   const char **argv,
 		   const char *prefix UNUSED,
-		   struct repository *repo UNUSED)
+		   struct repository *repo)
 {
 	show_usage_if_asked(argc, argv, builtin_merge_ours_usage);
 
@@ -30,9 +27,9 @@ int cmd_merge_ours(int argc,
 	 * commit.  The index must match HEAD, or this merge cannot go
 	 * through.
 	 */
-	if (repo_read_index(the_repository) < 0)
+	if (repo_read_index(repo) < 0)
 		die_errno("read_cache failed");
-	if (index_differs_from(the_repository, "HEAD", NULL, 0))
+	if (index_differs_from(repo, "HEAD", NULL, 0))
 		return 2;
 	return 0;
 }

-- 
gitgitgadget