From: Patrick Steinhardt Date: Thu, 19 Nov 2026 11:47:07 GMT Subject: [PATCH v5 06/13] builtin/rerere: turn "clear" into a proper subcommand Message-ID: <20261119-pks-rerere-subcommands-v5-6-0c1092b88958@pks.im> In-Reply-To: <20261119-pks-rerere-subcommands-v5-0-0c1092b88958@pks.im> As explained in a preceding commit, a subsequent commit will introduce proper subcommands as supported by our parse-options subsystem. Refactor the "clear" subcommand to use parse-options as a preparatory step. Signed-off-by: Patrick Steinhardt --- builtin/rerere.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index 5d2ae154ff8..62f69b488b0 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -52,6 +52,26 @@ static int diff_two(const char *file1, const char *label1, return ret; } +static int cmd_rerere_clear(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_clear(repo, &merge_rr); + + string_list_clear(&merge_rr, 1); + return 0; +} + static int cmd_rerere_forget(int argc, const char **argv, const char *prefix, @@ -107,9 +127,8 @@ int cmd_rerere(int argc, if (!strcmp(argv[0], "forget")) return cmd_rerere_forget(argc, argv, prefix, repo); - - if (!strcmp(argv[0], "clear")) { - rerere_clear(repo, &merge_rr); + else if (!strcmp(argv[0], "clear")) { + return cmd_rerere_clear(argc, argv, prefix, repo); } else if (!strcmp(argv[0], "gc")) rerere_gc(repo, &merge_rr, skip_locked ? RERERE_NOWAIT : 0); -- 2.56.1.831.g720f3f5937.dirty