Skip to content

pr-2306/yoichi/submodule-with-worktree-v1

pr-2306/yoichi/submodule-with-worktree-v1: submodule: support worktree-specific configuration
tagged this 12 Nov 12:03 
When extensions.worktreeConfig is enabled, this series stores submodule
settings that can differ between worktrees in the worktree config.

The changes include:

 * [1/3] Keep submodule.<name>.gitdir relative for linked worktrees.
 * [2/3] Store submodule settings in the worktree config when
   extensions.worktreeConfig is enabled.
 * [3/3] Make git submodule init copy an existing gitdir setting to the
   current worktree config only when it belongs to that worktree.

Yoichi NAKAYAMA (3):
  submodule: make submodule.<name>.gitdir relative for worktrees
  submodule: store settings in worktree config when enabled
  submodule init: copy submodule.<name>.gitdir to config.worktree

 Documentation/config/submodule.adoc        |   3 +-
 builtin/submodule--helper.c                | 197 +++++++++++++++------
 builtin/worktree.c                         |  23 +++
 t/t2405-worktree-submodule.sh              | 129 ++++++++++++++
 t/t7425-submodule-gitdir-path-extension.sh | 131 ++++++++++++++
 5 files changed, 431 insertions(+), 52 deletions(-)

base-commit: fbd2d1e765da4d2931cadc4c62d3ca5d5b590e7e

Submitted-As: https://lore.kernel.org/git/pull.2306.git.1794484985.gitgitgadget@gmail.com
Assets 2
Loading