]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/worktree-avoid-duplication-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:02 +0000 (10:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:02 +0000 (10:43 -0800)
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

1  2 
worktree.c

diff --cc worktree.c
Simple merge