From: Junio C Hamano <gitster@pobox.com>
To: "Philip Oakley" <philipoakley@iee.org>
Cc: "Ulrich Windl" <Ulrich.Windl@rz.uni-regensburg.de>,
<git@vger.kernel.org>
Subject: Re: bug deleting "unmerged" branch (2.12.3)
Date: Sat, 02 Dec 2017 18:37:44 -0800 [thread overview]
Message-ID: <xmqq1skcleo7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <7973FF5C21C64E6492828DD0B91F5AF7@PhilipOakley> (Philip Oakley's message of "Sat, 2 Dec 2017 20:56:44 -0000")
"Philip Oakley" <philipoakley@iee.org> writes:
> I think it was that currently you are on M, and neither A nor B are
> ancestors (i.e. merged) of M.
>
> As Junio said:- "branch -d" protects branches that are yet to be
> merged to the **current branch**.
Actually, I think people loosened this over time and removal of
branch X is not rejected even if the range HEAD..X is not empty, as
long as X is marked to integrate with/build on something else with
branch.X.{remote,merge} and the range X@{upstream}..X is empty.
So the stress of "current branch" above you added is a bit of a
white lie.
next prev parent reply other threads:[~2017-12-03 2:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-28 14:21 bug deleting "unmerged" branch (2.12.3) Ulrich Windl
2017-11-28 15:32 ` Johannes Schindelin
2017-11-29 8:09 ` Antw: " Ulrich Windl
2017-11-29 12:27 ` Johannes Schindelin
2017-12-02 20:52 ` Philip Oakley
2017-11-29 0:58 ` Junio C Hamano
2017-11-29 8:32 ` Antw: " Ulrich Windl
2017-12-02 20:56 ` Philip Oakley
2017-12-03 2:37 ` Junio C Hamano [this message]
2017-12-03 23:30 ` Philip Oakley
2017-12-04 15:57 ` Antw: " Ulrich Windl
2017-12-08 20:26 ` Philip Oakley
2017-12-11 8:40 ` Antw: " Ulrich Windl
2017-12-12 16:57 ` Philip Oakley
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=xmqq1skcleo7.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Ulrich.Windl@rz.uni-regensburg.de \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.