diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-06-22 15:55:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-22 15:55:03 -0700 |
| commit | 9740ef888edadcb12442faf2a690016bb8a2c03c (patch) | |
| tree | 0f05bfe3204f247da3a68c8cfb462a68501e2b42 /builtin/merge-index.c | |
| parent | Merge branch 'jt/redact-all-cookies' (diff) | |
| parent | worktree: make "move" refuse to move atop missing registered worktree (diff) | |
| download | tgif-9740ef888edadcb12442faf2a690016bb8a2c03c.tar.xz | |
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 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions