All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tuomas Ahola <taahol@utu.fi>
To: Harald Nordgren <haraldnordgren@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com>,
	<git@vger.kernel.org>
Subject: Re: [PATCH 2/2] branch: protect local upstreams from -d
Date: Wed, 26 Aug 2026 11:46:41 +0300	[thread overview]
Message-ID: <20260826084641.tb2NX%taahol@utu.fi> (raw)
In-Reply-To: <CAHwyqnXjO6Cv50BVjJjW939A06-bQtcA2uf0Cwk+xuoc2Gh_LA@mail.gmail.com>

Harald Nordgren <haraldnordgren@gmail.com> wrote:

> Hmm, it makes sense what you are saying, but I could have sworn that
> you asked for this (likely some very different version from this) when
> I was working on delete-merged, i.e. to extend branch protections to
> '-d' as well. Phillip brought it up recently as well. Maybe I
> misunderstood.
> 
> 
> Harald

In <xmqq33yimsdp.fsf@gitster.g> Junio wrote:

} [...]
} 
} Do we also need the same safety around "git branch -d feature1" by
} the way?  The "-d" option with safety checks the same "is feature1
} already merged (to its upstream)?" condition, so it can protect the
} feature2 branch the same way, by saying either "oops, you cannot
} delete feature1 because you still have other branches like feature2
} that depend on it", or "ok, featur2 used to depend on feature1, but
} because we are deleting feature1 based on it being in origin/master,
} we will make feature2 depend on origin/master from now on".
} 

Harald, perhaps that's the passage you thought of?

-- 
Tuomas

  reply	other threads:[~2026-08-26  8:46 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-25 21:25 [PATCH 0/2] branch: -d protects upstream branches Harald Nordgren via GitGitGadget
2026-08-25 21:25 ` [PATCH 1/2] branch: move stacked branch helpers Harald Nordgren via GitGitGadget
2026-08-25 21:25 ` [PATCH 2/2] branch: protect local upstreams from -d Harald Nordgren via GitGitGadget
2026-08-25 21:59   ` Junio C Hamano
2026-08-26  6:56     ` Harald Nordgren
2026-08-26  8:46       ` Tuomas Ahola [this message]
2026-08-26  9:20         ` Harald Nordgren
2026-08-26 14:37       ` Junio C Hamano
2026-08-27  5:19   ` Elijah Newren

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=20260826084641.tb2NX%taahol@utu.fi \
    --to=taahol@utu.fi \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=haraldnordgren@gmail.com \
    /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.