From: Peter Jones <pjones@redhat.com>
To: git@vger.kernel.org
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Peter Jones" <pjones@redhat.com>
Subject: [PATCH v2 4/4] Make "git branch -d" prune missing worktrees automatically.
Date: Fri, 18 Oct 2019 15:45:42 -0400 [thread overview]
Message-ID: <20191018194542.1316981-4-pjones@redhat.com> (raw)
In-Reply-To: <20191018194542.1316981-1-pjones@redhat.com>
Currently, if you do:
$ git branch zonk origin/master
$ git worktree add zonk zonk
$ rm -rf zonk
$ git branch -d zonk
You get the following error:
$ git branch -d zonk
error: Cannot delete branch 'zonk' checked out at '/home/pjones/devel/kernel.org/git/zonk'
It isn't meaningfully checked out, the repo's data is just stale and no
longer reflects reality.
This makes it so that if nothing is present where a worktree is
supposedly checked out, deleting the branch will automatically prune it.
Signed-off-by: Peter Jones <pjones@redhat.com>
---
builtin/branch.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 2ef214632f0..a2a1e89c66b 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -236,13 +236,17 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
if (kinds == FILTER_REFS_BRANCHES) {
const struct worktree *wt =
find_shared_symref("HEAD", name);
- if (wt) {
+ int rc = -1;
+
+ if (wt && (rc = prune_worktree_if_missing(wt)) < 0) {
error(_("Cannot delete branch '%s' "
"checked out at '%s'"),
bname.buf, wt->path);
ret = 1;
continue;
}
+ if (rc >= 0)
+ delete_worktrees_dir_if_empty();
}
target = resolve_refdup(name,
--
2.23.0
next prev parent reply other threads:[~2019-10-18 19:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 16:28 [PATCH 1/2] Make die_if_checked_out() ignore missing worktree checkouts Peter Jones
2019-10-17 16:28 ` [PATCH 2/2] Make "git branch -d" prune missing worktrees automatically Peter Jones
2019-10-17 17:28 ` Eric Sunshine
2019-10-18 19:43 ` Peter Jones
2019-10-18 19:45 ` [PATCH v2 1/4] libgit: Add a read-only helper to test the worktree lock Peter Jones
2019-10-18 19:45 ` [PATCH v2 2/4] libgit: Expose more worktree functionality Peter Jones
2019-10-21 1:59 ` Junio C Hamano
2019-10-18 19:45 ` [PATCH v2 3/4] Make die_if_checked_out() prune missing checkouts of unlocked worktrees Peter Jones
2019-10-21 2:09 ` Junio C Hamano
2019-10-18 19:45 ` Peter Jones [this message]
2019-10-21 1:36 ` [PATCH v2 1/4] libgit: Add a read-only helper to test the worktree lock Junio C Hamano
2019-11-08 10:14 ` [PATCH 2/2] Make "git branch -d" prune missing worktrees automatically Eric Sunshine
2019-11-08 14:56 ` Phillip Wood
2019-11-09 11:34 ` Eric Sunshine
2019-10-17 16:44 ` [PATCH 1/2] Make die_if_checked_out() ignore missing worktree checkouts SZEDER Gábor
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=20191018194542.1316981-4-pjones@redhat.com \
--to=pjones@redhat.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@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).