git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35d7715 105df73)
Merge branch 'nd/corrupt-worktrees' into maint
authorJunio C Hamano <redacted>
Thu, 25 Jul 2019 21:27:07 +0000 (14:27 -0700)
committerJunio C Hamano <redacted>
Thu, 25 Jul 2019 21:27:07 +0000 (14:27 -0700)
"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

1  2 
t/t2400-worktree-add.sh patch | diff1 | diff2 | blob | history
worktree.c patch | diff1 | diff2 | blob | history

diff --cc t/t2400-worktree-add.sh
Simple merge
diff --cc worktree.c
Simple merge
git clone https://git.99rst.org/PROJECT