mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
branch: protect branches checked out in all worktrees
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 <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9fdf4f1db4
commit
593a2a5d06
13
branch.c
13
branch.c
|
@ -199,7 +199,8 @@ int validate_branchname(const char *name, struct strbuf *ref)
|
||||||
*/
|
*/
|
||||||
int validate_new_branchname(const char *name, struct strbuf *ref, int force)
|
int validate_new_branchname(const char *name, struct strbuf *ref, int force)
|
||||||
{
|
{
|
||||||
const char *head;
|
struct worktree **worktrees;
|
||||||
|
const struct worktree *wt;
|
||||||
|
|
||||||
if (!validate_branchname(name, ref))
|
if (!validate_branchname(name, ref))
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -208,9 +209,13 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force)
|
||||||
die(_("a branch named '%s' already exists"),
|
die(_("a branch named '%s' already exists"),
|
||||||
ref->buf + strlen("refs/heads/"));
|
ref->buf + strlen("refs/heads/"));
|
||||||
|
|
||||||
head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
|
worktrees = get_worktrees();
|
||||||
if (!is_bare_repository() && head && !strcmp(head, ref->buf))
|
wt = find_shared_symref(worktrees, "HEAD", ref->buf);
|
||||||
die(_("cannot force update the current branch"));
|
if (wt && !wt->is_bare)
|
||||||
|
die(_("cannot force update the branch '%s'"
|
||||||
|
"checked out at '%s'"),
|
||||||
|
ref->buf + strlen("refs/heads/"), wt->path);
|
||||||
|
free_worktrees(worktrees);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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_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' '
|
test_expect_success 'git branch -M baz bam should succeed when baz is checked out' '
|
||||||
git checkout -b baz &&
|
git checkout -b baz &&
|
||||||
git branch bam &&
|
git branch bam &&
|
||||||
|
|
Loading…
Reference in a new issue