git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Regression: submodule worktrees can clobber core.worktree config

From
TŚTomasz Śniatowski <tsniatowski@vewd.com>
Date
Jan 8, 2019, 22:16 UTC
Message-ID
<CAG0vfyQeA3Hm7AsYgYtP4v-Yg0=rKXW0YYfg_emAwEscZha4VA@mail.gmail.com>
After upgrading to 2.20.1 I noticed in some submodule+worktree scenarios git
will break the submodule configuration. Reproducible with:
    git init a && (cd a; touch a; git add a; git commit -ma)
    git init b && (cd b; git submodule add ../a; git commit -mb)
    git -C b worktree add ../b2
    git -C b/a worktree add ../../b2/a
    git -C b status
    git -C b2 submodule update
    git -C b status
The submodule update in the _worktree_ puts an invalid core.worktree value in
the _original_ repository submodule config (b/.git/modules/a/config), causing
the last git status to error out with:
    fatal: cannot chdir to '../../../../../../b2/a': No such file or directory
    fatal: 'git status --porcelain=2' failed in submodule a
Looking at the config file itself, the submodule update operation applies the
following change (the new path is invalid):
    -       worktree = ../../../a
    +       worktree = ../../../../../../b2/a

This worked fine on 2.19.2 (no config change, no error), and was useful to have a worktree with (large) submodules that are also worktrees.

Bisects down to: 74d4731da1 submodule--helper: replace connect-gitdir-workingtree by ensure-core-worktree

-- Tomasz Śniatowski

Next: Duy Nguyen
Message 1 of 8 in “Regression: submodule worktrees can clobber core.worktree config”
  1. Tomasz ŚniatowskiJan 8, 2019
  2. Duy NguyenJan 8, 2019
  3. Tomasz ŚniatowskiJan 9, 2019
  4. Duy NguyenJan 9, 2019
  5. Stefan BellerJan 9, 2019
  6. Tomasz ŚniatowskiJan 9, 2019
  7. Stefan BellerJan 10, 2019
  8. Duy NguyenJan 11, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.