From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2018 20:53:59 +0000 (-0700)
Subject: Merge branch 'es/worktree-forced-ops-fix'
X-Git-Tag: v2.20.0-rc0~230
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1c515bf7e2b395509a122fb92cd6f925bf09a6fe

Merge branch 'es/worktree-forced-ops-fix'

Fix a bug in which the same path could be registered under multiple
worktree entries if the path was missing (for instance, was removed
manually).  Also, as a convenience, expand the number of cases in
which --force is applicable.

* es/worktree-forced-ops-fix:
doc-diff: force worktree add
worktree: delete .git/worktrees if empty after 'remove'
worktree: teach 'remove' to override lock when --force given twice
worktree: teach 'move' to override lock when --force given twice
worktree: teach 'add' to respect --force for registered but missing path
worktree: disallow adding same path multiple times
worktree: prepare for more checks of whether path can become worktree
worktree: generalize delete_git_dir() to reduce code duplication
worktree: move delete_git_dir() earlier in file for upcoming new callers
worktree: don't die() in library function find_worktree()
---

1c515bf7e2b395509a122fb92cd6f925bf09a6fe