Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org,
	 "Mark C. Chu-Carroll" <markchucarroll@fastmail.com>,
	 Karthik Nayak <karthik.188@gmail.com>
Subject: Re: [PATCH v4 10/12] builtin/rerere: turn "gc" into a proper subcommand
Date: Mon, 16 Nov 2026 17:21:32 -0800	[thread overview]
Message-ID: <xmqq33t0i76r.fsf@gitster.g> (raw)
In-Reply-To: <20261111-pks-rerere-subcommands-v4-10-df0c8bf79e16@pks.im> (Patrick Steinhardt's message of "Wed, 11 Nov 2026 13:18:46 +0100")

Patrick Steinhardt <ps@pks.im> writes:

> As explained in a preceding commit, a subsequent commit will introduce
> proper subcommands as supported by our parse-options subsystem. Refactor
> the "gc" subcommand to use parse-options as a preparatory step.

Even though the cover letter may have mentioned it, this should also
describe the deliberate UI regression to help future readers of "git
log".  When they see a bug report on the mailing list and bisect
leads to this commit, it makes a huge difference if you tell them
that the change in behavior was deliberate, with a clear reason
explained in the log message.  Otherwise they would say "the UI
regressed with this commit without explaining why it was thought to
be a good idea.  The commit unceremoniously drops a test that points
out this exact regression".



> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  builtin/rerere.c  | 43 ++++++++++++++++++++++++++++++-------------
>  t/t4200-rerere.sh |  5 -----
>  2 files changed, 30 insertions(+), 18 deletions(-)

> diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
> index ab412ecc6e8..0d4cbf5114a 100755
> --- a/t/t4200-rerere.sh
> +++ b/t/t4200-rerere.sh
> @@ -263,11 +263,6 @@ test_expect_success 'gc --skip-locked prunes while MERGE_RR is not locked' '
>  	test_path_is_missing $rr2/preimage
>  '
>  
> -test_expect_success '--skip-locked is only accepted by gc' '
> -	test_must_fail git rerere --skip-locked clear 2>err &&
> -	test_grep "option .--skip-locked. requires .gc." err
> -'
> -
>  test_expect_success 'a held lock is waited out within rerere.lockTimeout' '
>  	git reset --hard &&
>  	rm -rf $rr &&

  reply	other threads:[~2026-11-17  1:21 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 [this message]
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
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=xmqq33t0i76r.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=karthik.188@gmail.com \
    --cc=markchucarroll@fastmail.com \
    --cc=ps@pks.im \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox