From: Patrick Steinhardt Date: Wed, 18 Nov 2026 14:09:49 GMT Subject: Re: [PATCH v4 00/12] builtin/rerere: convert to use subcommands Message-ID: In-Reply-To: On Mon, Nov 16, 2026 at 05:16:12PM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > Patrick Steinhardt 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 ... | diff | status | remaining | gc] > > the above might be a regression that is more easily spotted by > folks. True, will fix. Patrick