mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/worktree-remove-with-uninitialized-submodules'

Browse Source 
"git worktree remove" and "git worktree move" refused to work when
there is a submodule involved.  This has been loosened to ignore
uninitialized submodules.

* nd/worktree-remove-with-uninitialized-submodules:
  worktree: allow to (re)move worktrees with uninitialized submodules
This commit is contained in:
Junio C Hamano
2019-01-18 13:49:54 -08:00
parent bb20dbbc20 00a6d4d1d2
commit 726f89c2dd
2 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
t/t2028-worktree-move.sh
View File

@ -112,6 +112,26 @@ test_expect_success 'move locked worktree (force)' '
git worktree move --force --force flump ploof
'
test_expect_success 'move a repo with uninitialized submodule' '
git init withsub &&
(
cd withsub &&
test_commit initial &&
git submodule add "$PWD"/.git sub &&
git commit -m withsub &&
git worktree add second HEAD &&
git worktree move second third
)
'
test_expect_success 'not move a repo with initialized submodule' '
(
cd withsub &&
git -C third submodule update &&
test_must_fail git worktree move third forth
)
'
test_expect_success 'remove main worktree' '
test_must_fail git worktree remove .
'
@ -185,4 +205,21 @@ test_expect_success 'remove cleans up .git/worktrees when empty' '
)
'
test_expect_success 'remove a repo with uninitialized submodule' '
(
cd withsub &&
git worktree add to-remove HEAD &&
git worktree remove to-remove
)
'
test_expect_success 'not remove a repo with initialized submodule' '
(
cd withsub &&
git worktree add to-remove HEAD &&
git -C to-remove submodule update &&
test_must_fail git worktree remove to-remove
)
'
test_done