Re: [PATCH v4 4/4] branch: Protect branches checked out in all worktrees
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 9, 2021, 16:24 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2111091724150.54@tvgsbejvaqbjf.bet>
- 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
Show 57 quoted lines
>
> 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
>
>