From: Taylor Blau <me@ttaylorr.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: Jeff King <peff@peff.net>,
Martin von Zweigbergk <martinvonz@google.com>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Bug in `git branch --delete main` when on other orphan brancht
Date: Tue, 1 Nov 2022 16:14:40 -0400 [thread overview]
Message-ID: <Y2F+MA+cAsEB0Glb@nand.local> (raw)
In-Reply-To: <Y2F9lkCWf/2rjT2E@nand.local>
On Tue, Nov 01, 2022 at 04:12:06PM -0400, Taylor Blau wrote:
> Yeah, that looks reasonable to me. Presumably we want a small test, as
> well, but I doubt that is any more complicated than:
>
> --- 8< ---
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index 7f605f865b..6ace22f7ce 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -279,6 +279,14 @@ test_expect_success 'git branch -M and -C fail on detached HEAD' '
> test_cmp expect err
> '
>
> +test_expect_success 'git branch -d on detached HEAD' '
> + test_when_finished "git checkout main && git branch -D other" &&
> + git branch other &&
> + git checkout --orphan orphan &&
> + test_must_fail git branch -d other 2>err &&
> + grep "not fully merged" err
> +'
> +
> test_expect_success 'git branch -v -d t should work' '
> git branch t &&
> git rev-parse --verify refs/heads/t &&
> --- >8 ---
Actually, the test doesn't need "other" here, since we aren't actually
going to delete the target branch (for the exact same reason that you
pointed out to Martin earlier in the thread).
So it could actually be as small as something like this:
--- >8 ---
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 7f605f865b..464d3f610b 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -279,6 +279,13 @@ test_expect_success 'git branch -M and -C fail on detached HEAD' '
test_cmp expect err
'
+test_expect_success 'git branch -d on detached HEAD' '
+ test_when_finished git checkout main &&
+ git checkout --orphan orphan &&
+ test_must_fail git branch -d main 2>err &&
+ grep "not fully merged" err
+'
+
test_expect_success 'git branch -v -d t should work' '
git branch t &&
git rev-parse --verify refs/heads/t &&
--- 8< ---
Thanks,
Taylor
next prev parent reply other threads:[~2022-11-01 20:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-29 5:46 Bug in `git branch --delete main` when on other orphan branch Martin von Zweigbergk
2022-11-01 10:15 ` Jeff King
2022-11-01 15:31 ` Martin von Zweigbergk
2022-11-01 20:12 ` Taylor Blau
2022-11-01 20:14 ` Taylor Blau [this message]
2022-11-01 21:45 ` Bug in `git branch --delete main` when on other orphan brancht Jeff King
2022-11-02 0:59 ` Taylor Blau
2022-11-01 20:32 ` [PATCH] branch: gracefully handle '-d' on detached HEAD Taylor Blau
2022-11-02 5:27 ` [PATCH v2] branch: gracefully handle '-d' on orphan HEAD Jeff King
2022-11-04 1:26 ` Rubén Justo
2022-11-04 5:36 ` Jeff King
2022-11-06 22:22 ` Rubén Justo
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=Y2F+MA+cAsEB0Glb@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martinvonz@google.com \
--cc=peff@peff.net \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).