mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <>
To: Taylor Blau <>
Cc: Martin von Zweigbergk <>,
	Junio C Hamano <>,
	Git Mailing List <>
Subject: Re: Bug in `git branch --delete main` when on other orphan brancht
Date: Tue, 1 Nov 2022 17:45:36 -0400	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <Y2F+MA+cAsEB0Glb@nand.local>

On Tue, Nov 01, 2022 at 04:14:40PM -0400, Taylor Blau wrote:

> 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/ b/t/
> index 7f605f865b..464d3f610b 100755
> --- a/t/
> +++ b/t/
> @@ -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
> +'

I think there's a more interesting case, which is when "main" has a
configured upstream to which it's fully merged. And then the deletion
actually succeeds (and the bug is not just giving us a crappy message,
but actually doing causing the wrong outcome).

And for that we'd probably not want to use "main", since a successful
test will actually delete it. ;)

I'll try later tonight to integrate that test into the patch you've


  reply	other threads:[~2022-11-01 21:45 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     ` Bug in `git branch --delete main` when on other orphan brancht Taylor Blau
2022-11-01 21:45       ` Jeff King [this message]
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:

  List information:

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

  git send-email \ \ \ \ \ \ \

* 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

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).