| commit | 684e742249b48ec0c5491a98fa3b1427793738ce | |
| author | Jeff King <peff@peff.net> | |
| Thu, 30 Aug 2018 07:54:31 +0000 (30 03:54 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Sep 2018 17:47:21 +0000 (5 10:47 -0700) | ||
| tree | 112cc2f49172c8084561a7c9a28cfd2906db4342 | treesnapshot (tar.gz zip) |
| parent | 3a5404333c6c8b5897e78c9dcb711d623035791b | commitdiff |
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>
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>
| Documentation/doc-diff | diffblobblamehistory |