From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Anders Kaseorg <andersk@mit.edu>, Jeff King <peff@peff.net>,
git@vger.kernel.org, Andreas Heiduk <andreas.heiduk@mathema.de>
Subject: Re: [PATCH v3 2/2] receive-pack: Protect current branch for bare repository worktree
Date: Tue, 9 Nov 2021 16:37:08 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2111091635531.54@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqzgqe448a.fsf@gitster.g>
Hi,
On Mon, 8 Nov 2021, Junio C Hamano wrote:
> Anders Kaseorg <andersk@mit.edu> writes:
>
> > diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
> > index 4ef4ecbe71..52a4686afe 100755
> > --- a/t/t5516-fetch-push.sh
> > +++ b/t/t5516-fetch-push.sh
> > @@ -1763,20 +1763,25 @@ test_expect_success 'updateInstead with push-to-checkout hook' '
> >
> > test_expect_success 'denyCurrentBranch and worktrees' '
> > git worktree add new-wt &&
> > + git clone --bare . bare.git &&
> > + git -C bare.git worktree add bare-wt &&
>
> We create a bare.git bare repository with a bare-wt worktree that
> has a working tree. bare-wt branch must be protected now.
>
> [...]
>
> > '
> >
> > test_expect_success 'refuse fetch to current branch of worktree' '
> > test_commit -C cloned second &&
> > test_must_fail git fetch cloned HEAD:new-wt &&
> > - git clone --bare . bare.git &&
> > - git -C bare.git worktree add bare-wt &&
>
> It is a bit sad that these two tests are so inter-dependent.
> Depending on an earlier failure of other tests, this may fail in an
> unexpected way.
Indeed. Maybe we should keep the latter as-is, and add this to the former?
test_when_finished "rm -rf bare.git bare-wt" &&
Ciao,
Dscho
prev parent reply other threads:[~2021-11-09 15:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 20:16 [PATCH v3 2/2] receive-pack: Protect current branch for bare repository worktree Anders Kaseorg
2021-11-08 23:28 ` Junio C Hamano
2021-11-09 0:44 ` Junio C Hamano
2021-11-09 16:04 ` Johannes Schindelin
2021-11-09 1:10 ` Anders Kaseorg
2021-11-09 3:00 ` [PATCH v4 1/4] fetch: Protect branches checked out in all worktrees Anders Kaseorg
2021-11-09 3:00 ` [PATCH v4 2/4] receive-pack: Clean dead code from update_worktree() Anders Kaseorg
2021-11-09 16:16 ` Johannes Schindelin
2021-11-09 22:58 ` Anders Kaseorg
2021-11-09 3:00 ` [PATCH v4 3/4] receive-pack: Protect current branch for bare repository worktree Anders Kaseorg
2021-11-09 16:22 ` Johannes Schindelin
2021-11-09 23:03 ` Anders Kaseorg
2021-11-09 23:09 ` [PATCH v5 1/4] fetch: Protect branches checked out in all worktrees Anders Kaseorg
2021-11-09 23:09 ` [PATCH v5 2/4] receive-pack: Clean dead code from update_worktree() Anders Kaseorg
2021-11-10 3:57 ` Ævar Arnfjörð Bjarmason
2021-11-10 12:11 ` Johannes Schindelin
2021-11-09 23:09 ` [PATCH v5 3/4] receive-pack: Protect current branch for bare repository worktree Anders Kaseorg
2021-11-10 4:00 ` Ævar Arnfjörð Bjarmason
2021-11-09 23:09 ` [PATCH v5 4/4] branch: Protect branches checked out in all worktrees Anders Kaseorg
2021-11-10 4:03 ` Ævar Arnfjörð Bjarmason
2021-11-10 3:56 ` [PATCH v5 1/4] fetch: " Ævar Arnfjörð Bjarmason
2021-11-10 12:18 ` Johannes Schindelin
2021-11-10 23:46 ` Junio C Hamano
2021-11-11 0:11 ` Junio C Hamano
2021-11-10 22:09 ` Junio C Hamano
2021-11-10 23:33 ` Anders Kaseorg
2021-11-09 3:00 ` [PATCH v4 4/4] branch: " Anders Kaseorg
2021-11-09 16:24 ` Johannes Schindelin
2021-11-09 16:09 ` [PATCH v4 1/4] fetch: " Johannes Schindelin
2021-11-09 22:52 ` Anders Kaseorg
2021-11-09 23:00 ` Junio C Hamano
2021-11-09 23:28 ` Junio C Hamano
2021-11-09 23:32 ` Anders Kaseorg
2021-11-09 15:37 ` Johannes Schindelin [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2111091635531.54@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=andersk@mit.edu \
--cc=andreas.heiduk@mathema.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).