From: Patrick Steinhardt Date: Fri, 06 Nov 2026 15:14:02 GMT Subject: [PATCH v3 08/12] builtin/rerere: turn "remaining" into a proper subcommand Message-ID: <20261106-pks-rerere-subcommands-v3-8-4ff164d8fb81@pks.im> In-Reply-To: <20261106-pks-rerere-subcommands-v3-0-4ff164d8fb81@pks.im> As explained in a preceding commit, a subsequent commit will introduce proper subcommands as supported by our parse-options subsystem. Refactor the "remaining" subcommand to use parse-options as a preparatory step. Signed-off-by: Patrick Steinhardt --- builtin/rerere.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index 2bcd270a1f1..3f82bcbeb10 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -94,6 +94,34 @@ static int cmd_rerere_forget(int argc, return ret; } +static int cmd_rerere_remaining(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; + + argc = parse_options(argc, argv, prefix, options, rerere_usage, 0); + if (argc) + usage(_("too many arguments")); + + 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); + else + /* prepare for later call to + * string_list_clear() */ + merge_rr.items[i].util = NULL; + } + + string_list_clear(&merge_rr, 1); + return 0; +} + static int cmd_rerere_status(int argc, const char **argv, const char *prefix, @@ -160,17 +188,9 @@ int cmd_rerere(int argc, skip_locked ? RERERE_NOWAIT : 0); 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) - printf("%s\n", merge_rr.items[i].string); - else - /* prepare for later call to - * string_list_clear() */ - merge_rr.items[i].util = NULL; - } - } else if (!strcmp(argv[0], "diff")) { + else if (!strcmp(argv[0], "remaining")) + return cmd_rerere_remaining(argc, argv, prefix, repo); + else if (!strcmp(argv[0], "diff")) { struct strbuf buf = STRBUF_INIT; struct rerere_cache cache; -- 2.56.0.500.g5d06dc02cd.dirty