From: Phillip Wood <phillip.wood123@gmail.com>
To: Thomas Bachem <mail@thomasbachem.com>, phillip.wood@dunelm.org.uk
Cc: git@vger.kernel.org, ps@pks.im, gitster@pobox.com,
johannes.schindelin@gmx.de
Subject: Re: [PATCH v2 2/3] sequencer: run auto maintenance once a sequence is done
Date: Mon, 7 Sep 2026 17:40:12 +0100 [thread overview]
Message-ID: <1e9f7b72-9f77-46e9-950e-df60b5a0539f@gmail.com> (raw)
In-Reply-To: <CAA0xjto++XQ6SZVfr5hWq2+CzeBsqSmTOLq_5UvL5s-0HDzaxw@mail.gmail.com>
Hi Thomas
On 07/09/2026 17:36, Thomas Bachem wrote:
>
>> Anyway this change is at the end of pick_commits(), just before we
>> finish so looks like the right place to call run_auto_maintenance()
>
> Patrick would rather have one exit shared by both rebase backends. In
> my reply to him I've proposed moving the call out of the sequencer
> into builtin/rebase.c and builtin/revert.c, the way am.c leaves it to
> rebase.c today. Say if you'd rather keep it here.
That works for we and means we don't have to sprinkle calls to
run_auto_maintenance() around to accommodate the different code paths
for single and multiple picks.
>> It is a shame the single pick variants of "git cherry-pick" and "git
>> revert" do not share the same code path as the multiple pick variants.
>> continue_single_pick() runs "git commit" without calling
>> run_git_commit() which is also unfortunate, but means that we could just
>> rely and "git commit" to call run_auto_maintenance() for us.
>
> That works until the next patch, which turns auto maintenance off in
> every command the sequencer spawns, this "git commit" included. So
> somebody has to run it afterwards. With the call in builtin/revert.c,
> cherry-pick does that itself once the continue returns.
Sounds good
Thanks
Phillip
>
>> Do we want to assert that we don't run auto maintenance up to this point?
>
> Yes, I'll add that, and the next patch will extend this test instead
> of adding its own.
>
>> Using test_grep here would mean we get some useful test output if there
>> are not matches in the file. Without that test_line_count just says the
>> line count didn't match and prints an empty file.
>
> Will do.
>
> Thanks,
> Thomas
next prev parent reply other threads:[~2026-09-07 16:40 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-04 7:53 [PATCH 0/2] sequencer: leave auto maintenance to the end of a rebase Thomas Bachem via GitGitGadget
2026-09-04 7:53 ` [PATCH 1/2] sequencer: run auto maintenance once a rebase is done Thomas Bachem via GitGitGadget
2026-09-04 15:03 ` Phillip Wood
2026-09-04 7:53 ` [PATCH 2/2] sequencer: keep auto maintenance out of the commands a rebase spawns Thomas Bachem via GitGitGadget
2026-09-04 15:03 ` Phillip Wood
2026-09-04 15:55 ` Thomas Bachem
2026-09-04 15:51 ` [PATCH v2 0/3] sequencer: leave auto maintenance to the end of a sequence Thomas Bachem via GitGitGadget
2026-09-04 15:51 ` [PATCH v2 1/3] config: add git_config_append_parameter() Thomas Bachem via GitGitGadget
2026-09-07 8:14 ` Patrick Steinhardt
2026-09-07 13:24 ` Phillip Wood
2026-09-07 14:47 ` Patrick Steinhardt
2026-09-07 16:37 ` Thomas Bachem
2026-09-04 15:51 ` [PATCH v2 2/3] sequencer: run auto maintenance once a sequence is done Thomas Bachem via GitGitGadget
2026-09-07 8:14 ` Patrick Steinhardt
2026-09-07 16:35 ` Thomas Bachem
2026-09-08 5:50 ` Patrick Steinhardt
2026-09-08 7:46 ` Thomas Bachem
2026-09-07 13:25 ` Phillip Wood
2026-09-07 16:36 ` Thomas Bachem
2026-09-07 16:40 ` Phillip Wood [this message]
2026-09-04 15:51 ` [PATCH v2 3/3] sequencer: keep auto maintenance out of the commands a sequence spawns Thomas Bachem via GitGitGadget
2026-09-04 21:21 ` Junio C Hamano
2026-09-05 5:42 ` Thomas Bachem
2026-09-07 8:14 ` Patrick Steinhardt
2026-09-07 16:35 ` Thomas Bachem
2026-09-07 13:24 ` Phillip Wood
2026-09-07 16:37 ` Thomas Bachem
2026-09-08 10:28 ` [PATCH v3 0/3] sequencer: leave auto maintenance to the end of a sequence Thomas Bachem via GitGitGadget
2026-09-08 10:28 ` [PATCH v3 1/3] config: add git_config_append_parameter() Thomas Bachem via GitGitGadget
2026-09-08 10:28 ` [PATCH v3 2/3] rebase, cherry-pick, revert: run auto maintenance when done Thomas Bachem via GitGitGadget
2026-09-08 10:28 ` [PATCH v3 3/3] sequencer: disable auto maintenance in spawned commands Thomas Bachem via GitGitGadget
2026-09-08 15:53 ` [PATCH v3 0/3] sequencer: leave auto maintenance to the end of a sequence Junio C Hamano
2026-09-08 19:38 ` Kristoffer Haugsbakk
2026-09-09 5:57 ` Patrick Steinhardt
2026-09-10 8:25 ` Thomas Bachem
2026-09-09 8:25 ` [PATCH v4 " Thomas Bachem via GitGitGadget
2026-09-09 8:25 ` [PATCH v4 1/3] config: add git_config_append_parameter() Thomas Bachem via GitGitGadget
2026-09-11 7:34 ` Patrick Steinhardt
2026-09-09 8:25 ` [PATCH v4 2/3] rebase, cherry-pick, revert: run auto maintenance when done Thomas Bachem via GitGitGadget
2026-09-11 7:34 ` Patrick Steinhardt
2026-09-09 8:25 ` [PATCH v4 3/3] sequencer: disable auto maintenance in spawned commands Thomas Bachem via GitGitGadget
2026-09-09 15:40 ` Phillip Wood
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=1e9f7b72-9f77-46e9-950e-df60b5a0539f@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=mail@thomasbachem.com \
--cc=phillip.wood@dunelm.org.uk \
--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