Re: [PATCH v4 00/12] builtin/rerere: convert to use subcommands
Patrick Steinhardt <ps@pks.im> writes:
Show 15 quoted lines
> Hi,
>
> while reviewing some patch series around git-rerere(1) recently I was a
> bit appalled by our custom subcommand parsing that we do here. This
> patch series here thus cleans up and modernizes that part a bit so that
> git-rerere(1) behaves like every other Git command that happens to have
> subcommands.
>
> This series is based on 37b3475fb53 (The 9th batch, 2026-10-25) with
> ps/rerere-remove-global-state at b948c10c8b3 (rerere: get rid of global
> rerere cache state, 2026-10-23) merged into it.
>
> Changes in v4:
> - Some more polishing for `RERERE_{NO,}AUTOUPDATE` documentation.
> - Die in case both of these flags are passed.Definitely a welcome improvement!
Show 14 quoted lines
> - Link to v3: https://patch.msgid.link/20261106-pks-rerere-subcommands-v3-0-4ff164d8fb81@pks.im
>
> Changes in v3:
> - Clarify what `RERERE_NOAUTOUPDATE` does.
> - Link to v2: https://patch.msgid.link/20261029-pks-rerere-subcommands-v2-0-07d5ba18e882@pks.im
>
> Changes in v2:
> - Document rerere flags.
> - Rename `rerere_record()` to just `rerere()`.
> - Link to v1: https://patch.msgid.link/20261027-pks-rerere-subcommands-v1-0-d836c36ce0c5@pks.im
>
> Thanks!
>
> Patrick
Show 41 quoted lines
> Range-diff versus v3:
>
> 1: e9237465706 = 1: f669dc6eddf rerere: rename `repo_rerere()`
> 2: 94d91a0620d ! 2: 4fd3f6aa650 rerere: convert flags into an enum
> @@ Commit message
> around as enums so that it becomes trivial to see what kind of flags are
> expected. Adapt the rerere flags accordingly and document them.
>
> + While at it, detect the case where both `RERERE_AUTOUPDATE` and
> + `RERERE_NOAUTOUPDATE` are passed. This combination does not make a lot
> + of sense, and it's not obvious which of those flags takes precedence
> + (it's `RERERE_AUTOUPDATE`). All current callers know to only pass one of
> + those flags, but let's be safe rather than sorry and `BUG()` in case
> + both are passed.
> +
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
>
> ## rerere.c ##
> @@ rerere.c: static int is_rerere_enabled(struct repository *r)
> {
> int lock_timeout_ms = 1000;
> int fd;
> +@@ rerere.c: int rerere_cache_setup(struct rerere_cache *cache,
> + repo_config_get_bool(r, "rerere.autoupdate", &cache->autoupdate);
> + repo_config_get_int(r, "rerere.locktimeout", &lock_timeout_ms);
> +
> ++ if ((flags & RERERE_AUTOUPDATE) && (flags & RERERE_NOAUTOUPDATE))
> ++ BUG("RERERE_AUTOUPDATE cannot be used with RERERE_NOAUTOUPDATE");
> + if (flags & (RERERE_AUTOUPDATE|RERERE_NOAUTOUPDATE))
> + cache->autoupdate = !!(flags & RERERE_AUTOUPDATE);
> + if ((flags & RERERE_READONLY) && (flags & RERERE_NOWAIT))
> @@ rerere.c: int rerere_cache_setup(struct rerere_cache *cache,
> return fd;
> }
> @@ rerere.h: struct rerere_id {
> + RERERE_AUTOUPDATE = (1 << 0),
> +
> + /*
> -+ * Reverse of RERERE_AUTOUPDATE. That is, update the file in the
> -+ * working tree but don't touch the index.
> ++ * update the file in the working tree but don't touch the index. ThisShow 21 quoted lines
> ++ * can be used to explicitly override "rerere.autoUpdate".
> ++ *
> ++ * This flag is essentially the reverse of `RERERE_AUTOUPDATE`. It is
> ++ * invalid to pass both flags at the same time.
> + */
> + RERERE_NOAUTOUPDATE = (1 << 1),
> +
> 3: 99faad47068 = 3: 48692c2c88d builtin/rerere: drop `the_repository`
> 4: f164c482227 = 4: e76991dd39d builtin/rerere: stop passing flags to subcommands that ignore them
> 5: 0573d2323e8 = 5: 2474dca4713 builtin/rerere: turn "forget" into a proper subcommand
> 6: 2098dedf4fd = 6: cecdbb1c63b builtin/rerere: turn "clear" into a proper subcommand
> 7: e8eaa2b4092 = 7: 54fc766f9d2 builtin/rerere: turn "status" into a proper subcommand
> 8: a5781284b8b = 8: fa2c839b2cb builtin/rerere: turn "remaining" into a proper subcommand
> 9: 9a4278df0ea = 9: 416b8311ca9 builtin/rerere: turn "diff" into a proper subcommand
> 10: e63b9be0d74 = 10: adb2b68f833 builtin/rerere: turn "gc" into a proper subcommand
> 11: 47889896ecb = 11: a12e19cb2e8 builtin/rerere: use `OPT_SUBCOMMAND()`
> 12: 5e16a247b49 = 12: 4b1b6170ba3 builtin/rerere: introduce proper usage strings for subcommands
>
> ---
> base-commit: 710910c03a22ac663885049213b9fef5853ea8e0
> change-id: 20261027-pks-rerere-subcommands-318d41553438