Skip to content
  • Stefan Beller's avatar
    submodule: unset core.worktree if no working tree is present · 4fa4f90c
    Stefan Beller authored and Junio C Hamano's avatar Junio C Hamano committed
    When a submodules work tree is removed, we should unset its core.worktree
    setting as the worktree is no longer present. This is not just in line
    with the conceptual view of submodules, but it fixes an inconvenience
    for looking at submodules that are not checked out:
    
        git clone --recurse-submodules git://github.com/git/git
    
     && cd git &&
        git checkout --recurse-submodules v2.13.0
        git -C .git/modules/sha1collisiondetection log
        fatal: cannot chdir to '../../../sha1collisiondetection': \
            No such file or directory
    
    With this patch applied, the final call to git log works instead of dying
    in its setup, as the checkout will unset the core.worktree setting such
    that following log will be run in a bare repository.
    
    This patch covers all commands that are in the unpack machinery, i.e.
    checkout, read-tree, reset. A follow up patch will address
    "git submodule deinit", which will also make use of the new function
    submodule_unset_core_worktree(), which is why we expose it in this patch.
    
    Signed-off-by: default avatarStefan Beller <sbeller@google.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    4fa4f90c