diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 13:19:41 -0700 |
| commit | 000bce0ee4d0ef719b84fb643c45fe68fa4bb773 (patch) | |
| tree | 10840f2b1f53f5549db2eafb4493443fcefe3303 /t/t2400-worktree-add.sh | |
| parent | ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0 (diff) | |
| parent | 105df73e71a9eb901d7ca96f12ce3645729ae486 (diff) | |
| download | git-000bce0ee4d0ef719b84fb643c45fe68fa4bb773.tar.xz | |
Merge branch 'nd/corrupt-worktrees'
"git worktree add" used to fail when another worktree connected to
the same repository was corrupt, which has been corrected.
* nd/corrupt-worktrees:
worktree add: be tolerant of corrupt worktrees
Diffstat (limited to 't/t2400-worktree-add.sh')
| -rwxr-xr-x | t/t2400-worktree-add.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh index c989dbe321..e819ba741e 100755 --- a/t/t2400-worktree-add.sh +++ b/t/t2400-worktree-add.sh @@ -575,4 +575,16 @@ test_expect_success FUNNYNAMES 'sanitize generated worktree name' ' test -d .git/worktrees/---weird-.- ' +test_expect_success '"add" should not fail because of another bad worktree' ' + git init add-fail && + ( + cd add-fail && + test_commit first && + mkdir sub && + git worktree add sub/to-be-deleted && + rm -rf sub && + git worktree add second + ) +' + test_done |