From: Anders Kaseorg <andersk@mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: 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: Mon, 8 Nov 2021 17:10:43 -0800 [thread overview]
Message-ID: <a25d105a-875b-fa6a-771a-37936779f067@mit.edu> (raw)
In-Reply-To: <xmqqzgqe448a.fsf@gitster.g>
On 11/8/21 15:28, Junio C Hamano wrote:
> My reading hiccupped after "at"; perhaps enclose the double-dot
> inside a pair of double quotes would make it easier to follow.
Will update.
>> @@ -1456,11 +1456,11 @@ static const char *update_worktree(unsigned char *sha1, const struct worktree *w
>> work_tree = worktree->path;
>> else if (git_work_tree_cfg)
>> work_tree = git_work_tree_cfg;
>
> Not a fault of this patch at all, but I am not sure if this existing
> bit of code is correct.
Perhaps this code is unreachable?
The worktree argument of update_worktree() should never be NULL, because
we’d only have set do_update_worktree = 1 if find_shared_symref()
returned non-NULL. And it looks to me like worktree->path should always
be initialized to non-NULL, in either get_main_worktree() or
get_linked_worktree()? I haven’t read enough of the code to be totally
confident in this though.
> The callsite of the other function this patch modifies is in this
> update() function much later, and I think it should be updated to
> use the variable "worktree" instead of calling find_shared_symref()
> again with the same parameters.
Will update.
> We are not checking if we correctly update the working tree; we are
> only seeing "git push" succeeds. Which might want to be tightened
> up.
Reasonable. This is also the case with the existing test.
> 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.
Yeah, I guess I wasn’t sure how much interdependence was allowed or
expected. For example, the existing test already fails when run by
itself (./t5516-fetch-push.sh --run=103) because the repository starts
out empty. I’ll see what I can do, perhaps making use of the
test_when_finished helper.
Anders
next prev parent reply other threads:[~2021-11-09 1:23 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 [this message]
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 ` [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=a25d105a-875b-fa6a-771a-37936779f067@mit.edu \
--to=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).