From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Jun 2019 20:19:41 +0000 (-0700)
Subject: Merge branch 'nd/corrupt-worktrees'
X-Git-Tag: v2.23.0-rc0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=000bce0ee4d0ef719b84fb643c45fe68fa4bb773;p=thirdparty%2Fgit.git

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
---

000bce0ee4d0ef719b84fb643c45fe68fa4bb773
diff --cc t/t2400-worktree-add.sh
index c989dbe321,d83a9f0fdc..e819ba741e
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@@ -570,9 -570,16 +570,21 @@@ test_expect_success '"add" an existing 
  	git worktree add --force --force --detach gnoo
  '
  
 +test_expect_success FUNNYNAMES 'sanitize generated worktree name' '
 +	git worktree add --detach ".  weird*..?.lock.lock" &&
 +	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