From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Anders Kaseorg <andersk@mit.edu>
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 4/4] branch: Protect branches checked out in all worktrees
Date: Tue, 9 Nov 2021 17:24:47 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2111091724150.54@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20211109030028.2196416-4-andersk@mit.edu>
Hi Anders,
On Mon, 8 Nov 2021, Anders Kaseorg wrote:
> Refuse to force-move a branch over the currently checked out branch of
> any working tree, not just the current one.
Good catch!
I read through the four patches, offered a couple of suggestions, but
nothing major. Well done!
Thank you,
Dscho
>
> Signed-off-by: Anders Kaseorg <andersk@mit.edu>
> ---
> 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 &&
> --
> 2.33.1
>
>
next prev parent reply other threads:[~2021-11-09 16:25 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 [this message]
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=nycvar.QRO.7.76.6.2111091724150.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).