diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:59 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:59 +0300 |
commit | 1c515bf7e2b395509a122fb92cd6f925bf09a6fe (patch) | |
tree | 8e4410c4163d6d8c985f7aef742efab8cb563ef6 /Documentation/doc-diff | |
parent | 2af0b1c6007401086bd72d4f49fbd5e9462f37f4 (diff) | |
parent | 684e742249b48ec0c5491a98fa3b1427793738ce (diff) |
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()
Diffstat (limited to 'Documentation/doc-diff')
-rwxr-xr-x | Documentation/doc-diff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/doc-diff b/Documentation/doc-diff index cece4fd537..dfd9418778 100755 --- a/Documentation/doc-diff +++ b/Documentation/doc-diff @@ -75,7 +75,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 |