git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Erik Johnson <palehose@gmail.com>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Git mailing list <git@vger.kernel.org>
Subject: Re: git branch doesn't allow me to forcibly delete branch which was checked out in a now-deleted worktree dir
Date: Fri, 8 Jul 2016 21:22:23 -0500	[thread overview]
Message-ID: <20160709022223.GC1916@gmail.com> (raw)
In-Reply-To: <CA+P7+xr_dYbno+JsTmaG+WWrgwsAXXGTyA6HL4A4A34ahHMD=Q@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1475 bytes --]

On Fri, Jul 08, 2016 at 05:41:17PM -0700, Jacob Keller wrote:
>On Thu, Jul 7, 2016 at 5:36 PM, Erik Johnson <palehose@gmail.com> wrote:
>> I'm not expecting _any_ git branch command to prune worktrees, but a
>> branch _deletion_ shouldn't fail because git thinks the branch is
>> checked out in a worktree that doesn't exist anymore. Even in the
>> scenario where the worktree corresponding to that branch is on removable
>> media, does it really matter? You're trying to delete the branch.
>
>I disagree. git branch -d (should) fail to delete a branch when it is
>checked out in a worktree. If the worktree is a persistent (ie: not
>there due to removable media etc)  directory then it *definitely*
>shouldn't allow you to delete.
>
>It is possible we should update "git branch -d" should perform a
>worktree prune first, since that would enable it to determine that you
>deleted the directory, and any worktree which is removable should be
>marked as persistent.
>
>Given that there is a known workaround (git worktree prune) and that
>it is expected behavior for a branch checked out to prevent deletion,
>I think the best coarse of action would be to patch git branch -d to
>do a prune before attempting to delete.
>
>Thanks,
>Jake

Well, I never mentioned -d (I was using -D), but I think we're both in
agreement.

--

-Erik

"For me, it is far better to grasp the universe as it really is than to
persist in delusion, however satisfying and reassuring."  --Carl Sagan


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

  reply	other threads:[~2016-07-09  2:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-07 18:44 git branch doesn't allow me to forcibly delete branch which was checked out in a now-deleted worktree dir Erik Johnson
2016-07-07 23:39 ` Jacob Keller
2016-07-08  0:36   ` Erik Johnson
2016-07-09  0:41     ` Jacob Keller
2016-07-09  2:22       ` Erik Johnson [this message]
2016-07-09  4:58         ` Jacob Keller
2016-07-09  5:05           ` Erik Johnson
2016-07-09  5:33 ` Duy Nguyen

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160709022223.GC1916@gmail.com \
    --to=palehose@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jacob.keller@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.
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 NNTP newsgroup(s).