From: Patrick Steinhardt Date: Wed, 11 Nov 2026 12:18:43 GMT Subject: [PATCH v4 07/12] builtin/rerere: turn "status" into a proper subcommand Message-ID: <20261111-pks-rerere-subcommands-v4-7-df0c8bf79e16@pks.im> In-Reply-To: <20261111-pks-rerere-subcommands-v4-0-df0c8bf79e16@pks.im> As explained in a preceding commit, a subsequent commit will introduce proper subcommands as supported by our parse-options subsystem. Refactor the "status" subcommand to use parse-options as a preparatory step. Signed-off-by: Patrick Steinhardt --- builtin/rerere.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index 62f69b488b0..2bcd270a1f1 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -94,6 +94,32 @@ static int cmd_rerere_forget(int argc, return ret; } +static int cmd_rerere_status(int argc, + const char **argv, + const char *prefix, + struct repository *repo) +{ + struct option options[] = { + OPT_END(), + }; + struct string_list merge_rr = STRING_LIST_INIT_DUP; + struct rerere_cache cache; + + argc = parse_options(argc, argv, prefix, options, rerere_usage, 0); + if (argc) + usage(_("too many arguments")); + + if (rerere_cache_setup(&cache, repo, &merge_rr, + RERERE_READONLY) < 0) + return 0; + for (size_t i = 0; i < merge_rr.nr; i++) + printf("%s\n", merge_rr.items[i].string); + + string_list_clear(&merge_rr, 1); + rerere_cache_release(&cache); + return 0; +} + int cmd_rerere(int argc, const char **argv, const char *prefix, @@ -132,17 +158,9 @@ int cmd_rerere(int argc, } else if (!strcmp(argv[0], "gc")) 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, repo, &merge_rr, - RERERE_READONLY) < 0) - return 0; - for (size_t i = 0; i < merge_rr.nr; i++) - printf("%s\n", merge_rr.items[i].string); - - rerere_cache_release(&cache); - } else if (!strcmp(argv[0], "remaining")) { + else if (!strcmp(argv[0], "status")) + return cmd_rerere_status(argc, argv, prefix, repo); + else if (!strcmp(argv[0], "remaining")) { rerere_remaining(repo, &merge_rr); for (size_t i = 0; i < merge_rr.nr; i++) { if (merge_rr.items[i].util != RERERE_RESOLVED) -- 2.56.0.611.g1030f0b940.dirty