From: Anders Kaseorg <andersk@mit.edu>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
git@vger.kernel.org, Andreas Heiduk <andreas.heiduk@mathema.de>
Subject: Re: [PATCH v4 3/4] receive-pack: Protect current branch for bare repository worktree
Date: Tue, 9 Nov 2021 15:03:49 -0800 [thread overview]
Message-ID: <2f983e36-532f-ac87-9ade-fba4c6b9d276@mit.edu> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2111091717230.54@tvgsbejvaqbjf.bet>
On 11/9/21 08:22, Johannes Schindelin wrote:
> While `find_shared_symref()` currently won't return a `worktree` with a
> non-zero `is_bare`, to future-proof the code we might want to turn the
> `if (worktree)` below (8 lines outside the current diff context) into `if
> (worktree && !worktree->is_bare)`.
Will do.
>> +test_expect_success 'denyCurrentBranch and bare repository worktrees' '
>> + test_when_finished "rm -fr bare.git" &&
>
> While `wt/` will be created inside `bare.git` and therefore be removed,
> the branch `wt` won't. Maybe add `&& git branch -D wt`?
The branch ‘wt’ is inside bare.git.
> I like fruit, too! Apple, banana, grape, yummy. I wonder what's next :-)
Yay!
> Maybe make sure that `bare.git/wt/grape.t` exists? We do want the worktree
> to be updated, after all...
Right, I’d forgotten this one. Will do.
Thanks all for the helpful reviews!
Anders
next prev parent reply other threads:[~2021-11-09 23:04 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 [this message]
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 ` [PATCH v3 2/2] receive-pack: Protect current branch for bare repository worktree Johannes Schindelin
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=2f983e36-532f-ac87-9ade-fba4c6b9d276@mit.edu \
--to=andersk@mit.edu \
--cc=Johannes.Schindelin@gmx.de \
--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).