From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2020 18:43:02 +0000 (-0800)
Subject: Merge branch 'es/worktree-avoid-duplication-fix'
X-Git-Tag: v2.26.0-rc0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49e5043b09fffb0411e8bae19d60014e72a36fd0;p=thirdparty%2Fgit.git

Merge branch 'es/worktree-avoid-duplication-fix'

In rare cases "git worktree add <path>" could think that <path>
was already a registered worktree even when it wasn't and refuse
to add the new worktree. This has been corrected.

* es/worktree-avoid-duplication-fix:
  worktree: don't allow "add" validation to be fooled by suffix matching
  worktree: add utility to find worktree by pathname
  worktree: improve find_worktree() documentation
---

49e5043b09fffb0411e8bae19d60014e72a36fd0