diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-06-23 01:55:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-23 01:55:03 +0300 |
| commit | 9740ef888edadcb12442faf2a690016bb8a2c03c (patch) | |
| tree | 0f05bfe3204f247da3a68c8cfb462a68501e2b42 /Documentation | |
| parent | b8a52995941fca5dee9179607f089c39ac559965 (diff) | |
| parent | 810382ed378731314c03627a8a2d8962b814ad17 (diff) | |
Merge branch 'es/worktree-duplicate-paths'
The same worktree directory must be registered only once, but
"git worktree move" allowed this invariant to be violated, which
has been corrected.
* es/worktree-duplicate-paths:
worktree: make "move" refuse to move atop missing registered worktree
worktree: generalize candidate worktree path validation
worktree: prune linked worktree referencing main worktree path
worktree: prune duplicate entries referencing same worktree path
worktree: make high-level pruning re-usable
worktree: give "should be pruned?" function more meaningful name
worktree: factor out repeated string literal
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-worktree.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 85d92c9761..4796c3c05e 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -126,7 +126,9 @@ OPTIONS locked working tree path, specify `--force` twice. + `move` refuses to move a locked working tree unless `--force` is specified -twice. +twice. If the destination is already assigned to some other working tree but is +missing (for instance, if `<new-path>` was deleted manually), then `--force` +allows the move to proceed; use --force twice if the destination is locked. + `remove` refuses to remove an unclean working tree unless `--force` is used. To remove a locked working tree, specify `--force` twice. |