summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2018-08-30 03:54:31 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-05 10:47:21 -0700
commit684e742249b48ec0c5491a98fa3b1427793738ce (patch)
tree112cc2f49172c8084561a7c9a28cfd2906db4342 /builtin
parentworktree: delete .git/worktrees if empty after 'remove' (diff)
downloadtgif-684e742249b48ec0c5491a98fa3b1427793738ce.tar.xz
doc-diff: force worktree add
We avoid re-creating our temporary worktree if it's already there. But we may run into a situation where the worktree has been deleted, but an entry still exists in $GIT_DIR/worktrees. Older versions of git-worktree would annoyingly create a series of duplicate entries. Recent versions now detect and prevent this, allowing you to override with "-f". Since we know that the worktree in question was just our temporary workspace, it's safe for us to always pass "-f". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions