diff options
| author | Sam Bostock <sam@sambostock.ca> | 2026-02-06 19:16:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-06 11:45:31 -0800 |
| commit | ba447e9cec47ca5b1cc8cfeae8ca90bc962c54fa (patch) | |
| tree | 17b8cc1402cff42bfd50f030250e5baa5510b1c1 | |
| parent | 67ad42147a7acc2af6074753ebd03d904476118f (diff) | |
| download | git-ba447e9cec47ca5b1cc8cfeae8ca90bc962c54fa.tar.xz | |
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>
| -rw-r--r-- | builtin/merge-ours.c | 9 |
1 files 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; } |