From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>,
Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
Subject: Re: [PATCH RESEND] branch: allow deleting dangling branches with --force
Date: Wed, 25 Aug 2021 14:37:38 -0700 [thread overview]
Message-ID: <xmqqr1ehgq8t.fsf@gitster.g> (raw)
In-Reply-To: <7894f736-4681-7656-e2d4-5945d2c71d31@web.de> ("René Scharfe"'s message of "Wed, 25 Aug 2021 22:43:38 +0200")
René Scharfe <l.s.r@web.de> writes:
> git branch only allows deleting branches that point to valid commits.
> Skip that check if --force is given, as the caller is indicating with
> it that they know what they are doing and accept the consequences.
> This allows deleting dangling branches, which previously had to be
> reset to a valid start-point using --force first.
>
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> Original submission:
> http://public-inbox.org/git/52847a99-db7c-9634-b3b1-fd9b1342bc32@web.de/
Thanks.
> +test_expect_success 'branch --delete --force removes dangling branch' '
> + test_when_finished "rm -f .git/refs/heads/dangling" &&
> + echo $ZERO_OID >.git/refs/heads/dangling &&
> + git branch --delete --force dangling &&
> + test_path_is_missing .git/refs/heads/dangling
> +'
This goes against the spirit of the series merged at c9780bb2 (Merge
branch 'hn/prep-tests-for-reftable', 2021-07-13).
Can we creat the dangling ref and test the lack of "dangling" ref in
the end in a less transparent way?
An escape hatch is to make this test depend on the REFFILES
prerequisite, just like dc474899 (t4202: mark bogus head hash test
with REFFILES, 2021-05-31) did, which may be more appropriate.
> test_expect_success 'use --edit-description' '
> write_script editor <<-\EOF &&
> echo "New contents" >"$1"
> --
> 2.32.0
next prev parent reply other threads:[~2021-08-25 21:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-25 20:43 [PATCH RESEND] branch: allow deleting dangling branches with --force René Scharfe
2021-08-25 21:37 ` Junio C Hamano [this message]
2021-08-25 23:28 ` Ævar Arnfjörð Bjarmason
2021-08-26 18:19 ` René Scharfe
2021-08-26 7:26 ` Han-Wen Nienhuys
2021-08-26 16:54 ` Junio C Hamano
2021-08-26 17:38 ` Junio C Hamano
2021-08-27 7:24 ` Antw: [EXT] Re: [PATCH RESEND] branch: allow deleting dangling branches with ‑‑force Ulrich Windl
2021-08-27 7:53 ` Ævar Arnfjörð Bjarmason
2021-08-26 18:18 ` [PATCH RESEND] branch: allow deleting dangling branches with --force René Scharfe
2021-08-25 23:30 ` Ævar Arnfjörð Bjarmason
2021-08-26 18:19 ` René Scharfe
2021-08-26 18:19 ` [PATCH v2] " René Scharfe
2021-08-26 19:05 ` Junio C Hamano
2021-08-26 21:01 ` René Scharfe
2021-08-26 19:12 ` Ævar Arnfjörð Bjarmason
2021-08-27 18:35 ` [PATCH v3] " René Scharfe
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=xmqqr1ehgq8t.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Ulrich.Windl@rz.uni-regensburg.de \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
/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 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 NNTP newsgroup(s).