Re: bug deleting "unmerged" branch (2.12.3)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 3, 2017, 02:37 UTC
- Message-ID
- <xmqq1skcleo7.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <7973FF5C21C64E6492828DD0B91F5AF7@PhilipOakley>
"Philip Oakley" <philipoakley@iee.org> writes:
Show 5 quoted lines
> 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.