[PATCH b4 0/6] Keep the user's git config out of b4's scratch worktrees
Christian Brauner <[email protected]> Wed, 29 Jul 2026 12:44:27 +0200
| Newsgroups | org.kernel.linux.tools |
|---|---|
| Message-ID | <[email protected]> |
With submodule.recurse=true in the user's config b4 cannot apply
anything in a repo that carries submodules. The scratch worktree's
sparse checkout recurses, looks for the per-worktree submodule clones a
just-created worktree cannot have, and dies:
fatal: not a git repository: ../../worktrees/b4-shazam-worktree/modules/ezgb
fatal: could not reset submodule index
That takes review-branch creation, b4 shazam and the TUI's test applies
with it. The b4 repo itself is affected through its vendored
patatt/liblore/ezgb submodules.
Everything b4 does in those worktrees is thrown away when the call
returns, so they can run with overrides of their own: no submodule
recursion and no gpg signing. SCRATCH_GIT_OPTS carries both, since each
is inert where the other matters, and every scratch worktree switches
over to it: the shazam apply, the TUI's five hand-rolled test applies,
the fake-am staging worktree and the sent-tag worktree in b4 send. The
commits that outlive their worktree keep the user's signing config.
Signed-off-by: Christian Brauner (Amutable) <[email protected]>
---
Christian Brauner (6):
git_run_command: look past -c overrides for the subcommand
shazam: ignore the user's submodule.recurse in the scratch worktree
review-tui: use the shared scratch-worktree overrides for test applies
fake-am: use the scratch-worktree overrides in the staging worktree
send: use the scratch-worktree overrides when tagging a sent series
tests: exercise the scratch worktrees under submodule.recurse
src/b4/__init__.py | 43 +++++++++--
src/b4/ez.py | 8 +-
src/b4/review_tui/_modals.py | 44 +++++++----
src/b4/review_tui/_tracking_app.py | 11 ++-
src/tests/conftest.py | 52 ++++++++++++-
src/tests/test___init__.py | 15 ++++
src/tests/test_ez.py | 45 +++++++++++-
src/tests/test_tui_tracking.py | 146 ++++++++++++++++++++++++++++++++++++-
8 files changed, 332 insertions(+), 32 deletions(-)
---
base-commit: 99fe195c0aa5a88be5033f87cad22bc32d27cbfe
change-id: 20260729-work-b4-scratch-worktrees-f69cde824a95