All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
	"Mark C. Chu-Carroll" <markchucarroll@fastmail.com>,
	Karthik Nayak <karthik.188@gmail.com>
Subject: Re: [PATCH v4 00/12] builtin/rerere: convert to use subcommands
Date: Mon, 16 Nov 2026 08:57:20 +0100	[thread overview]
Message-ID: <avq3YHb_J8Ww6Kq7@pks.im> (raw)
In-Reply-To: <xmqq7bifponx.fsf@gitster.g>

On Sat, Nov 14, 2026 at 04:45:22AM -0800, Junio C Hamano wrote:
> Does the new syntax introduce a subtle UI regression that does not
> allow certain options before subcommands?  We used to take "git
> rerere --skip-locked gc", but now it has to be spelled as "git
> rerere gc --skip-locked", it seems.
> 
> I do not particularly care about the '--skip-locked' option itself,
> and I personally prefer to see options after non-options as a
> general CLI principle, but it seems that it is now required to give
> the option after the "gc" subcommand.
> 
> I do not know how often people run "git rerere" with these
> subcommands themselves.  This subtle change in the CLI may go
> unnoticed in a smaller project, but because we probably have more
> than a few thousand users, I am afraid that somebody will notice.
> 
> In the transcript below, "rungit TRACK" is my short-hand to run
> version of "git" from that integration branch.
> 
> $ rungit master rerere --skip-locked gc
> $ rungit next rerere --skip-locked gc
> $ 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.

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.

As documented in the commit message, I would argue that the current
status quo is just plain broken as we accept options in cases where they
aren't even being used at all. For "--skip-locked" that shouldn't be
much of an issue, as the flag has only just been introduced, so it's
very unlikely that there's any users of it out there just yet. So now is
the right moment to fix that design wart.

BUt that isn't true for the "--rerere-autoupdate" flag, which has
existed for a long time already. So if this backwards-incompatible
change is deemed to be too risky, then I'd adapt the code to only allow
that one flag in all locations.

Patrick

  reply	other threads:[~2026-11-16  7:57 UTC|newest]

Thread overview: 89+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-27 10:46 [PATCH 00/12] builtin/rerere: convert to use subcommands Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 01/12] rerere: rename `repo_rerere()` Patrick Steinhardt
2026-10-27 19:48   ` Junio C Hamano
2026-10-28  8:33     ` Patrick Steinhardt
2026-10-28 16:25       ` Junio C Hamano
2026-10-27 10:46 ` [PATCH 02/12] rerere: convert flags into an enum Patrick Steinhardt
2026-10-27 14:47   ` Mark C. Chu-Carroll
2026-10-27 19:40     ` Junio C Hamano
2026-10-28  8:33       ` Patrick Steinhardt
2026-10-28 14:11         ` Mark C. Chu-Carroll
2026-10-28 16:25         ` Junio C Hamano
2026-10-27 10:46 ` [PATCH 03/12] builtin/rerere: drop `the_repository` Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 04/12] builtin/rerere: stop passing flags to subcommands that ignore them Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 05/12] builtin/rerere: turn "forget" into a proper subcommand Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 06/12] builtin/rerere: turn "clear" " Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 07/12] builtin/rerere: turn "status" " Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 08/12] builtin/rerere: turn "remaining" " Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 09/12] builtin/rerere: turn "diff" " Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 10/12] builtin/rerere: turn "gc" " Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 11/12] builtin/rerere: use `OPT_SUBCOMMAND()` Patrick Steinhardt
2026-10-27 10:46 ` [PATCH 12/12] builtin/rerere: introduce proper usage strings for subcommands Patrick Steinhardt
2026-10-27 19:52 ` [PATCH 00/12] builtin/rerere: convert to use subcommands Junio C Hamano
2026-10-29  9:57 ` [PATCH v2 " Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 01/12] rerere: rename `repo_rerere()` Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 02/12] rerere: convert flags into an enum Patrick Steinhardt
2026-11-06 10:51     ` Karthik Nayak
2026-11-06 11:39       ` Patrick Steinhardt
2026-11-06 13:50         ` Karthik Nayak
2026-10-29  9:57   ` [PATCH v2 03/12] builtin/rerere: drop `the_repository` Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 04/12] builtin/rerere: stop passing flags to subcommands that ignore them Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 05/12] builtin/rerere: turn "forget" into a proper subcommand Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 06/12] builtin/rerere: turn "clear" " Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 07/12] builtin/rerere: turn "status" " Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 08/12] builtin/rerere: turn "remaining" " Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 09/12] builtin/rerere: turn "diff" " Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 10/12] builtin/rerere: turn "gc" " Patrick Steinhardt
2026-11-06 10:56     ` Karthik Nayak
2026-10-29  9:57   ` [PATCH v2 11/12] builtin/rerere: use `OPT_SUBCOMMAND()` Patrick Steinhardt
2026-11-06 11:44     ` Karthik Nayak
2026-11-06 14:25       ` Patrick Steinhardt
2026-10-29  9:57   ` [PATCH v2 12/12] builtin/rerere: introduce proper usage strings for subcommands Patrick Steinhardt
2026-11-06 11:45   ` [PATCH v2 00/12] builtin/rerere: convert to use subcommands Karthik Nayak
2026-11-06 15:13 ` [PATCH v3 " Patrick Steinhardt
2026-11-06 15:13   ` [PATCH v3 01/12] rerere: rename `repo_rerere()` Patrick Steinhardt
2026-11-06 15:13   ` [PATCH v3 02/12] rerere: convert flags into an enum Patrick Steinhardt
2026-11-06 16:39     ` Junio C Hamano
2026-11-09  7:06       ` Patrick Steinhardt
2026-11-09 15:40         ` Junio C Hamano
2026-11-09 19:13           ` Junio C Hamano
2026-11-11 11:02             ` Patrick Steinhardt
2026-11-06 15:13   ` [PATCH v3 03/12] builtin/rerere: drop `the_repository` Patrick Steinhardt
2026-11-06 15:13   ` [PATCH v3 04/12] builtin/rerere: stop passing flags to subcommands that ignore them Patrick Steinhardt
2026-11-06 15:13   ` [PATCH v3 05/12] builtin/rerere: turn "forget" into a proper subcommand Patrick Steinhardt
2026-11-06 15:14   ` [PATCH v3 06/12] builtin/rerere: turn "clear" " Patrick Steinhardt
2026-11-06 15:14   ` [PATCH v3 07/12] builtin/rerere: turn "status" " Patrick Steinhardt
2026-11-06 15:14   ` [PATCH v3 08/12] builtin/rerere: turn "remaining" " Patrick Steinhardt
2026-11-06 15:14   ` [PATCH v3 09/12] builtin/rerere: turn "diff" " Patrick Steinhardt
2026-11-06 15:14   ` [PATCH v3 10/12] builtin/rerere: turn "gc" " Patrick Steinhardt
2026-11-06 15:14   ` [PATCH v3 11/12] builtin/rerere: use `OPT_SUBCOMMAND()` Patrick Steinhardt
2026-11-06 15:14   ` [PATCH v3 12/12] builtin/rerere: introduce proper usage strings for subcommands Patrick Steinhardt
2026-11-11 12:18 ` [PATCH v4 00/12] builtin/rerere: convert to use subcommands Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 01/12] rerere: rename `repo_rerere()` Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 02/12] rerere: convert flags into an enum Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 03/12] builtin/rerere: drop `the_repository` Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 04/12] builtin/rerere: stop passing flags to subcommands that ignore them Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 05/12] builtin/rerere: turn "forget" into a proper subcommand Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 06/12] builtin/rerere: turn "clear" " Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 07/12] builtin/rerere: turn "status" " Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 08/12] builtin/rerere: turn "remaining" " Patrick Steinhardt
2026-11-11 12:18   ` [PATCH v4 09/12] builtin/rerere: turn "diff" " Patrick Steinhardt
2026-11-17  1:37     ` Junio C Hamano
2026-11-11 12:18   ` [PATCH v4 10/12] builtin/rerere: turn "gc" " Patrick Steinhardt
2026-11-17  1:21     ` Junio C Hamano
2026-11-11 12:18   ` [PATCH v4 11/12] builtin/rerere: use `OPT_SUBCOMMAND()` Patrick Steinhardt
2026-11-17  1:28     ` Junio C Hamano
2026-11-11 12:18   ` [PATCH v4 12/12] builtin/rerere: introduce proper usage strings for subcommands Patrick Steinhardt
2026-11-17  1:37     ` Junio C Hamano
2026-11-12 13:41   ` [PATCH v4 00/12] builtin/rerere: convert to use subcommands Karthik Nayak
2026-11-13  7:20     ` Patrick Steinhardt
2026-11-13 18:09       ` Junio C Hamano
2026-11-13 19:38         ` Tuomas Ahola
2026-11-13 19:44         ` Phillip Wood
2026-11-13 21:44           ` Junio C Hamano
2026-11-14  7:22             ` Tuomas Ahola
2026-11-16  7:46               ` Patrick Steinhardt
2026-11-14 12:45   ` Junio C Hamano
2026-11-16  7:57     ` Patrick Steinhardt [this message]
2026-11-16 15:43       ` Junio C Hamano
2026-11-17  1:16         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=avq3YHb_J8Ww6Kq7@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=karthik.188@gmail.com \
    --cc=markchucarroll@fastmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.