From: Jeff King Date: Thu, 30 Aug 2018 07:54:31 +0000 (-0400) Subject: doc-diff: force worktree add X-Git-Tag: v2.20.0-rc0~230^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=684e742249b48ec0c5491a98fa3b1427793738ce;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/doc-diff b/Documentation/doc-diff index f483fe427c..19d841ddeb 100755 --- a/Documentation/doc-diff +++ b/Documentation/doc-diff @@ -54,7 +54,7 @@ fi # results that don't differ between the two trees. if ! test -d "$tmp/worktree" then - git worktree add --detach "$tmp/worktree" "$from" && + git worktree add -f --detach "$tmp/worktree" "$from" && dots=$(echo "$tmp/worktree" | sed 's#[^/]*#..#g') && ln -s "$dots/config.mak" "$tmp/worktree/config.mak" fi