[PATCH 03/12] builtin/rerere: drop `the_repository`
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Oct 27, 2026, 10:46 UTC
- Message-ID
- <20261027-pks-rerere-subcommands-v1-3-d836c36ce0c5@pks.im>
- In-Reply-To
- <20261027-pks-rerere-subcommands-v1-0-d836c36ce0c5@pks.im>
There are a couple of references to `the_repository` in git-rerere(1). As that command cannot run outside of a repository these references can be trivially replaced by the repository that's passed in as parameter to `cmd_rerere()`. We don't have to worry about the repository being `NULL` when called with "-h", either, as there are no references to the repo before we call `parse_options()`.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/rerere.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/builtin/rerere.c b/builtin/rerere.c index 1717fb7a65d..556f267f37d 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -1,5 +1,3 @@ -#define USE_THE_REPOSITORY_VARIABLE - #include "builtin.h" #include "config.h" #include "gettext.h" @@ -57,7 +55,7 @@ static int diff_two(const char *file1, const char *label1, int cmd_rerere(int argc, const char **argv, const char *prefix, - struct repository *repo UNUSED) + struct repository *repo) { struct string_list merge_rr = STRING_LIST_INIT_DUP; int autoupdate = -1, skip_locked = 0, flags = 0; @@ -75,7 +73,7 @@ int cmd_rerere(int argc, if (skip_locked && (argc < 1 || strcmp(argv[0], "gc"))) die(_("the option '%s' requires '%s'"), "--skip-locked", "gc"); - repo_config(the_repository, git_xmerge_config, NULL); + repo_config(repo, git_xmerge_config, NULL); if (autoupdate == 1) flags = RERERE_AUTOUPDATE; @@ -83,7 +81,7 @@ int cmd_rerere(int argc, flags = RERERE_NOAUTOUPDATE; if (argc < 1) - return rerere_record(the_repository, flags); + return rerere_record(repo, flags); if (!strcmp(argv[0], "forget")) { struct pathspec pathspec; @@ -94,21 +92,21 @@ int cmd_rerere(int argc, parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, prefix, argv + 1); - ret = rerere_forget(the_repository, &pathspec); + ret = rerere_forget(repo, &pathspec); clear_pathspec(&pathspec); return ret; } if (!strcmp(argv[0], "clear")) { - rerere_clear(the_repository, &merge_rr); + rerere_clear(repo, &merge_rr); } else if (!strcmp(argv[0], "gc")) - rerere_gc(the_repository, &merge_rr, + rerere_gc(repo, &merge_rr, skip_locked ? RERERE_NOWAIT : 0); else if (!strcmp(argv[0], "status")) { struct rerere_cache cache; - if (rerere_cache_setup(&cache, the_repository, &merge_rr, + if (rerere_cache_setup(&cache, repo, &merge_rr, flags | RERERE_READONLY) < 0) return 0; for (size_t i = 0; i < merge_rr.nr; i++) @@ -116,7 +114,7 @@ int cmd_rerere(int argc, rerere_cache_release(&cache); } else if (!strcmp(argv[0], "remaining")) { - rerere_remaining(the_repository, &merge_rr); + rerere_remaining(repo, &merge_rr); for (size_t i = 0; i < merge_rr.nr; i++) { if (merge_rr.items[i].util != RERERE_RESOLVED) printf("%s\n", merge_rr.items[i].string); @@ -129,16 +127,16 @@ int cmd_rerere(int argc, struct strbuf buf = STRBUF_INIT; struct rerere_cache cache; - if (rerere_cache_setup(&cache, the_repository, &merge_rr, + if (rerere_cache_setup(&cache, repo, &merge_rr, flags | RERERE_READONLY) < 0) return 0; for (size_t i = 0; i < merge_rr.nr; i++) { const char *path = merge_rr.items[i].string; const struct rerere_id *id = merge_rr.items[i].util; - if (diff_two(rerere_path(the_repository, &buf, id, "preimage"), + if (diff_two(rerere_path(repo, &buf, id, "preimage"), path, path, path)) die(_("unable to generate diff for '%s'"), - rerere_path(the_repository, &buf, id, NULL)); + rerere_path(repo, &buf, id, NULL)); } rerere_cache_release(&cache);
-- 2.56.0.341.g393f52fd96.dirty