From patchwork Mon Nov 8 20:15:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anders Kaseorg X-Patchwork-Id: 12609051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFCC9C433F5 for ; Mon, 8 Nov 2021 20:15:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C7924610FF for ; Mon, 8 Nov 2021 20:15:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238612AbhKHUSf (ORCPT ); Mon, 8 Nov 2021 15:18:35 -0500 Received: from outgoing-auth-1.mit.edu ([18.9.28.11]:39531 "EHLO outgoing.mit.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238770AbhKHUSZ (ORCPT ); Mon, 8 Nov 2021 15:18:25 -0500 Received: from localhost (SCRUBBING-BUBBLES.MIT.EDU [18.9.64.11]) (authenticated bits=0) (User authenticated as andersk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 1A8KFRWF003795; Mon, 8 Nov 2021 15:15:28 -0500 Date: Mon, 8 Nov 2021 15:15:27 -0500 (EST) From: Anders Kaseorg To: Junio C Hamano cc: Jeff King , git@vger.kernel.org, Andreas Heiduk Subject: [PATCH v3 1/2] fetch: Protect branches checked out in all worktrees Message-ID: User-Agent: Alpine 2.21.999 (DEB 260 2018-02-26) MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Refuse to fetch into the currently checked out branch of any working tree, not just the current one. Fixes this previously reported bug: https://public-inbox.org/git/cb957174-5e9a-5603-ea9e-ac9b58a2eaad@mathema.de As a side effect of using find_shared_symref, we’ll also refuse the fetch when we’re on a detached HEAD because we’re rebasing or bisecting on the branch in question. This seems like a sensible change. Signed-off-by: Anders Kaseorg --- builtin/fetch.c | 27 +++++++++++++-------------- t/t5516-fetch-push.sh | 11 +++++++++++ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index f7abbc31ff..61c8fc9983 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -28,6 +28,7 @@ #include "promisor-remote.h" #include "commit-graph.h" #include "shallow.h" +#include "worktree.h" #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000) @@ -854,7 +855,7 @@ static int update_local_ref(struct ref *ref, int summary_width) { struct commit *current = NULL, *updated; - struct branch *current_branch = branch_get(NULL); + const struct worktree *wt; const char *pretty_ref = prettify_refname(ref->name); int fast_forward = 0; @@ -868,16 +869,17 @@ static int update_local_ref(struct ref *ref, return 0; } - if (current_branch && - !strcmp(ref->name, current_branch->name) && - !(update_head_ok || is_bare_repository()) && + if (!update_head_ok && + (wt = find_shared_symref("HEAD", ref->name)) && !is_null_oid(&ref->old_oid)) { /* * If this is the head, and it's not okay to update * the head, and the old value of the head isn't empty... */ format_display(display, '!', _("[rejected]"), - _("can't fetch in current branch"), + wt->is_current ? + _("can't fetch in current branch") : + _("branch checked out in worktree"), remote, pretty_ref, summary_width); return 1; } @@ -1387,16 +1389,13 @@ static int prune_refs(struct refspec *rs, struct ref *ref_map, static void check_not_current_branch(struct ref *ref_map) { - struct branch *current_branch = branch_get(NULL); - - if (is_bare_repository() || !current_branch) - return; - + const struct worktree *wt; for (; ref_map; ref_map = ref_map->next) - if (ref_map->peer_ref && !strcmp(current_branch->refname, - ref_map->peer_ref->name)) - die(_("Refusing to fetch into current branch %s " - "of non-bare repository"), current_branch->refname); + if (ref_map->peer_ref && + (wt = find_shared_symref("HEAD", ref_map->peer_ref->name))) + die(_("Refusing to fetch into branch '%s' " + "checked out at '%s'"), + ref_map->peer_ref->name, wt->path); } static int truncate_fetch_head(void) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 8212ca56dc..4ef4ecbe71 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -1771,4 +1771,15 @@ test_expect_success 'denyCurrentBranch and worktrees' ' git -C cloned push origin HEAD:new-wt && test_must_fail git -C cloned push --delete origin new-wt ' + +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 && + test_must_fail git -C bare.git fetch ../cloned HEAD:bare-wt && + git fetch -u cloned HEAD:new-wt && + git -C bare.git fetch -u ../cloned HEAD:bare-wt +' + test_done From patchwork Mon Nov 8 20:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anders Kaseorg X-Patchwork-Id: 12609053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08534C433F5 for ; Mon, 8 Nov 2021 20:16:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDC276152A for ; Mon, 8 Nov 2021 20:16:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238617AbhKHUTD (ORCPT ); Mon, 8 Nov 2021 15:19:03 -0500 Received: from outgoing-auth-1.mit.edu ([18.9.28.11]:39651 "EHLO outgoing.mit.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S236622AbhKHUTC (ORCPT ); Mon, 8 Nov 2021 15:19:02 -0500 Received: from localhost (SCRUBBING-BUBBLES.MIT.EDU [18.9.64.11]) (authenticated bits=0) (User authenticated as andersk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 1A8KGCvb004248; Mon, 8 Nov 2021 15:16:13 -0500 Date: Mon, 8 Nov 2021 15:16:12 -0500 (EST) From: Anders Kaseorg To: Junio C Hamano cc: Jeff King , git@vger.kernel.org, Andreas Heiduk Subject: [PATCH v3 2/2] receive-pack: Protect current branch for bare repository worktree Message-ID: User-Agent: Alpine 2.21.999 (DEB 260 2018-02-26) MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org A bare repository won’t have a working tree at .., but it may still have separate working trees created with git worktree. We should protect the current branch of such working trees from being updated or deleted, according to receive.denyCurrentBranch. Signed-off-by: Anders Kaseorg --- builtin/receive-pack.c | 10 +++++----- t/t5516-fetch-push.sh | 11 ++++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 49b846d960..5efc9bc9fa 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -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; - else - work_tree = ".."; - - if (is_bare_repository()) + else if (is_bare_repository()) return "denyCurrentBranch = updateInstead needs a worktree"; + else + work_tree = ".."; + if (worktree) git_dir = get_worktree_git_dir(worktree); if (!git_dir) @@ -1486,7 +1486,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) struct object_id *old_oid = &cmd->old_oid; struct object_id *new_oid = &cmd->new_oid; int do_update_worktree = 0; - const struct worktree *worktree = is_bare_repository() ? NULL : find_shared_symref("HEAD", name); + const struct worktree *worktree = find_shared_symref("HEAD", name); /* only refs/... are allowed */ if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) { 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 && git clone . cloned && test_commit -C cloned first && test_config receive.denyCurrentBranch refuse && test_must_fail git -C cloned push origin HEAD:new-wt && + test_config -C bare.git receive.denyCurrentBranch refuse && + test_must_fail git -C cloned push ../bare.git HEAD:bare-wt && test_config receive.denyCurrentBranch updateInstead && git -C cloned push origin HEAD:new-wt && - test_must_fail git -C cloned push --delete origin new-wt + test_must_fail git -C cloned push --delete origin new-wt && + test_config -C bare.git receive.denyCurrentBranch updateInstead && + git -C cloned push ../bare.git HEAD:bare-wt && + test_must_fail git -C cloned push --delete ../bare.git bare-wt ' 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 && test_must_fail git -C bare.git fetch ../cloned HEAD:bare-wt && git fetch -u cloned HEAD:new-wt && git -C bare.git fetch -u ../cloned HEAD:bare-wt