From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: "Duy Nguyen" <pclouds@gmail.com>,
"Jonathan Müller" <jonathanmueller.dev@gmail.com>,
"Shourya Shukla" <shouryashukla.oo@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: [PATCH 0/8] worktree: tighten duplicate path detection
Date: Mon, 8 Jun 2020 02:23:48 -0400 [thread overview]
Message-ID: <20200608062356.40264-1-sunshine@sunshineco.com> (raw)
This patch series started as a (presumably) simple enhancement to make
"git worktree prune" more helpful to users who shoot themselves in the
foot[1] by causing a linked worktree to point at the main worktree, a
situation which "git worktree add" tries hard to disallow but which
users can accomplish merely be deleting and renaming directories
(without even mucking around inside the .git/worktrees/<id> directory).
The series grew as I realized that "git worktree move" does not employ
the same protections as "git worktree add" and happily allows multiple
linked worktrees to references the same location, thus that also had to
be fixed.
[1]: https://lore.kernel.org/git/CAPig+cTU8+N6Chimpoa2_T-TcXxw-3B9-9pjCLz7WeOh472P_A@mail.gmail.com/
Eric Sunshine (8):
worktree: factor out repeated string literal
worktree: prune corrupted worktree even if locked
worktree: give "should be pruned?" function more meaningful name
worktree: make high-level pruning re-usable
worktree: prune duplicate entries referencing same worktree path
worktree: prune linked worktree referencing main worktree path
worktree: generalize candidate worktree path validation
worktree: make "move" refuse to move atop missing registered worktree
Documentation/git-worktree.txt | 4 +-
builtin/worktree.c | 142 ++++++++++++++++++++++-----------
t/t2401-worktree-prune.sh | 38 ++++++++-
t/t2403-worktree-move.sh | 21 +++++
4 files changed, 157 insertions(+), 48 deletions(-)
--
2.27.0.290.gba653c62da
next reply other threads:[~2020-06-08 6:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-08 6:23 Eric Sunshine [this message]
2020-06-08 6:23 ` [PATCH 1/8] worktree: factor out repeated string literal Eric Sunshine
2020-06-08 19:38 ` Shourya Shukla
2020-06-08 21:41 ` Eric Sunshine
2020-06-08 6:23 ` [PATCH 2/8] worktree: prune corrupted worktree even if locked Eric Sunshine
2020-06-08 21:23 ` Junio C Hamano
2020-06-09 17:34 ` Eric Sunshine
2020-06-08 6:23 ` [PATCH 3/8] worktree: give "should be pruned?" function more meaningful name Eric Sunshine
2020-06-08 21:25 ` Junio C Hamano
2020-06-08 6:23 ` [PATCH 4/8] worktree: make high-level pruning re-usable Eric Sunshine
2020-06-08 21:29 ` Junio C Hamano
2020-06-08 6:23 ` [PATCH 5/8] worktree: prune duplicate entries referencing same worktree path Eric Sunshine
2020-06-08 6:23 ` [PATCH 6/8] worktree: prune linked worktree referencing main " Eric Sunshine
2020-06-08 21:59 ` Junio C Hamano
2020-06-09 17:38 ` Eric Sunshine
2020-06-08 6:23 ` [PATCH 7/8] worktree: generalize candidate worktree path validation Eric Sunshine
2020-06-08 22:02 ` Junio C Hamano
2020-06-08 6:23 ` [PATCH 8/8] worktree: make "move" refuse to move atop missing registered worktree Eric Sunshine
2020-06-08 15:19 ` Eric Sunshine
2020-06-08 22:06 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200608062356.40264-1-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=jonathanmueller.dev@gmail.com \
--cc=pclouds@gmail.com \
--cc=shouryashukla.oo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).