From: Patrick Steinhardt Date: Thu, 29 Oct 2026 09:57:13 GMT Subject: [PATCH v2 04/12] builtin/rerere: stop passing flags to subcommands that ignore them Message-ID: <20261029-pks-rerere-subcommands-v2-4-07d5ba18e882@pks.im> In-Reply-To: <20261029-pks-rerere-subcommands-v2-0-07d5ba18e882@pks.im> The git-rerere(1) command has a "--[no-]rerere-autoupdate" flag. If passed, we explicitly enable or disable recording clean merge resolutions that are staged in the index. This flag only matters to git-rerere(1) when not executed with any subcommand, but we also forward the flag to `git rerere status` and `git rerere diff`. This is mostly harmless as we would ignore those flags anyway, but it makes subsequent refactorings harder to understand. Prepare for these refactorings by not using the flag in those subcommands anymore. Signed-off-by: Patrick Steinhardt --- builtin/rerere.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index 83fb3783c61..405276cc94b 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -107,7 +107,7 @@ int cmd_rerere(int argc, struct rerere_cache cache; if (rerere_cache_setup(&cache, repo, &merge_rr, - flags | RERERE_READONLY) < 0) + RERERE_READONLY) < 0) return 0; for (size_t i = 0; i < merge_rr.nr; i++) printf("%s\n", merge_rr.items[i].string); @@ -128,7 +128,7 @@ int cmd_rerere(int argc, struct rerere_cache cache; if (rerere_cache_setup(&cache, repo, &merge_rr, - flags | RERERE_READONLY) < 0) + RERERE_READONLY) < 0) return 0; for (size_t i = 0; i < merge_rr.nr; i++) { const char *path = merge_rr.items[i].string; -- 2.56.0.341.g393f52fd96.dirty