From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jun 2020 22:55:03 +0000 (-0700)
Subject: Merge branch 'es/worktree-duplicate-paths'
X-Git-Tag: v2.28.0-rc0~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9740ef888edadcb12442faf2a690016bb8a2c03c;p=thirdparty%2Fgit.git

Merge branch 'es/worktree-duplicate-paths'

The same worktree directory must be registered only once, but
"git worktree move" allowed this invariant to be violated, which
has been corrected.

* es/worktree-duplicate-paths:
  worktree: make "move" refuse to move atop missing registered worktree
  worktree: generalize candidate worktree path validation
  worktree: prune linked worktree referencing main worktree path
  worktree: prune duplicate entries referencing same worktree path
  worktree: make high-level pruning re-usable
  worktree: give "should be pruned?" function more meaningful name
  worktree: factor out repeated string literal
---

9740ef888edadcb12442faf2a690016bb8a2c03c