From patchwork Tue Nov 9 23:09:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Kaseorg X-Patchwork-Id: 12611189 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 68227C433F5 for ; Tue, 9 Nov 2021 23:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46F1161105 for ; Tue, 9 Nov 2021 23:10:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242977AbhKIXNU (ORCPT ); Tue, 9 Nov 2021 18:13:20 -0500 Received: from outgoing-auth-1.mit.edu ([18.9.28.11]:52979 "EHLO outgoing.mit.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S242425AbhKIXNS (ORCPT ); Tue, 9 Nov 2021 18:13:18 -0500 Received: from localhost (198-27-191-186.fiber.dynamic.sonic.net [198.27.191.186]) (authenticated bits=0) (User authenticated as andersk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 1A9NAKLX014889 (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Nov 2021 18:10:22 -0500 From: Anders Kaseorg To: Junio C Hamano Cc: Johannes Schindelin , Jeff King , git@vger.kernel.org, Andreas Heiduk , Anders Kaseorg Subject: [PATCH v5 4/4] branch: Protect branches checked out in all worktrees Date: Tue, 9 Nov 2021 15:09:41 -0800 Message-Id: <20211109230941.2518143-4-andersk@mit.edu> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211109230941.2518143-1-andersk@mit.edu> References: <2f983e36-532f-ac87-9ade-fba4c6b9d276@mit.edu> <20211109230941.2518143-1-andersk@mit.edu> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Refuse to force-move a branch over the currently checked out branch of any working tree, not just the current one. Signed-off-by: Anders Kaseorg --- branch.c | 10 ++++++---- t/t3200-branch.sh | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/branch.c b/branch.c index 07a46430b3..581f0c02c2 100644 --- a/branch.c +++ b/branch.c @@ -199,7 +199,7 @@ int validate_branchname(const char *name, struct strbuf *ref) */ int validate_new_branchname(const char *name, struct strbuf *ref, int force) { - const char *head; + const struct worktree *wt; if (!validate_branchname(name, ref)) return 0; @@ -208,9 +208,11 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force) die(_("A branch named '%s' already exists."), ref->buf + strlen("refs/heads/")); - head = resolve_ref_unsafe("HEAD", 0, NULL, NULL); - if (!is_bare_repository() && head && !strcmp(head, ref->buf)) - die(_("Cannot force update the current branch.")); + wt = find_shared_symref("HEAD", ref->buf); + if (wt && !wt->is_bare) + die(_("Cannot force update the branch '%s'" + "checked out at '%s'."), + ref->buf + strlen("refs/heads/"), wt->path); return 1; } diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index e575ffb4ff..4c868bf971 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -168,6 +168,13 @@ test_expect_success 'git branch -M foo bar should fail when bar is checked out' test_must_fail git branch -M bar foo ' +test_expect_success 'git branch -M foo bar should fail when bar is checked out in worktree' ' + git branch -f bar && + test_when_finished "git worktree remove wt && git branch -D wt" && + git worktree add wt && + test_must_fail git branch -M bar wt +' + test_expect_success 'git branch -M baz bam should succeed when baz is checked out' ' git checkout -b baz && git branch bam &&