• David Turner (TS)'s avatar
    submodules: allow empty working-tree dirs in merge/cherry-pick · 5423d2e7
    David Turner (TS) authored
    When a submodule is being merged or cherry-picked into a working
    tree that already contains a corresponding empty directory, do not
    record a conflict.
    
    One situation where this bug appears is:
    
    - Commit 1 adds a submodule
    - Commit 2 removes that submodule and re-adds it into a subdirectory
           (sub1 to sub1/sub1).
    - Commit 3 adds an unrelated file.
    
    Now the user checks out commit 1 (first deinitializing the submodule),
    and attempts to cherry-pick commit 3.  Previously, this would fail,
    because the incoming submodule sub1/sub1 would falsely conflict with
    the empty sub1 directory.
    
    This patch ignores the empty sub1 directory, fixing the bug.  We only
    ignore the empty directory if the object being emplaced is a
    submodule, which expects an empty directory.
    Signed-off-by: David Turner (TS)'s avatarDavid Turner <dturner@twosigma.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    5423d2e7
t3426-rebase-submodule.sh 877 Bytes