merge-ours: drop USE_THE_REPOSITORY_VARIABLE
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sam Bostock committed
Feb 6, 2026 at 19:16 UTC
ba447e9cec47ca5b1cc8cfeae8ca90bc962c54fa
1 file changed
+3
-6
builtin/merge-ours.c
+3
-6
@@ -8,20 +8,17 @@
8
* Pretend we resolved the heads, but declare our tree trumps everybody else.
9
*/
10
11
-#define USE_THE_REPOSITORY_VARIABLE
12
-
11
#include "git-compat-util.h"
12
#include "builtin.h"
13
#include "diff.h"
14
17
-
15
static const char builtin_merge_ours_usage[] =
16
"git merge-ours <base>... -- HEAD <remote>...";
17
18
int cmd_merge_ours(int argc,
19
const char **argv,
20
const char *prefix UNUSED,
24
- struct repository *repo UNUSED)
21
+ struct repository *repo)
22
{
23
show_usage_if_asked(argc, argv, builtin_merge_ours_usage);
24
@@ -30,9 +27,9 @@ int cmd_merge_ours(int argc,
27
* commit. The index must match HEAD, or this merge cannot go
28
* through.
29
*/
33
- if (repo_read_index(the_repository) < 0)
30
+ if (repo_read_index(repo) < 0)
31
die_errno("read_cache failed");
35
- if (index_differs_from(the_repository, "HEAD", NULL, 0))
32
+ if (index_differs_from(repo, "HEAD", NULL, 0))
33
return 2;
34
return 0;
35
}