mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ulrich Windl" <>
To: <>, <>
Cc: <>
Subject: Antw: Re: bug deleting "unmerged" branch (2.12.3)
Date: Mon, 04 Dec 2017 16:57:16 +0100	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <AB9C836772CD4391A8866DC71103CCFE@PhilipOakley>

Hi Philip!

I'm unsure what you are asking for...

>>> "Philip Oakley" <> 04.12.17 0.30 Uhr >>>
From: "Junio C Hamano" <>
> "Philip Oakley" <> 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.

Ah, thanks. [I haven't had chance to check the code]

The man page does say:
.    -d
.    Delete a branch. The branch must be fully merged in its upstream
.    branch, or in HEAD if no upstream was set with --track 
.    or --set-upstream.

It's whether or not Ulrich had joined the two aspects together, and if the
doc was sufficient to help recognise the 'unmerged' issue. Ulrich?

  reply	other threads:[~2017-12-04 15:57 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
2017-12-03 23:30         ` Philip Oakley
2017-12-04 15:57           ` Ulrich Windl [this message]
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:

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