Re: [PATCH v4 00/12] builtin/rerere: convert to use subcommands
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 17, 2026, 01:16 UTC
- Message-ID
- <xmqqbj7oi7fn.fsf@gitster.g>
- In-Reply-To
- <xmqqik1wn5mu.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 25 quoted lines
> Patrick Steinhardt <ps@pks.im> writes: > >>> $ rungit seen rerere --skip-locked gc >>> error: unknown option `skip-locked' >>> usage: git rerere [--[no-]rerere-autoupdate] >>> >>> --[no-]rerere-autoupdate >>> register clean resolutions in index >>> $ rungit seen rerere gc --skip-locked >> >> Yes, as documented in "builtin/rerere: use `OPT_SUBCOMMAND()`. >> >> Unfortunately this means that we have a backwards-incompatible change >> because we no longer accept the "--[no-]rerere-autoupdate" flag for all >> subcommands. But this was arguably broken and misleading as we ignore >> this flag for any other subcommand aynway. So we cheat a bit and simply >> call it a bug that those flags were accepted in the first place. > > Ah, I missed that part. > >> But yes, the same is true for "--skip-locked". I was expecting more >> review feedback on that specific part, and was a bit surprised to get >> none. > > OK. Let's break it and have the users fix their scripts.
Having said that
$ rungit seen rerere unknown
usage: too many arguments
$ rungit master rerere unknown
usage: git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]the above might be a regression that is more easily spotted by folks.