undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

worktree add -B: do the checkout test before update branch

Browse Source 
If --force is not given but -B is, we should not proceed if the given
branch is already checked out elsewhere. add_worktree() has this test,
but it kicks in too late when "git branch --force" is already
executed. As a result, even though we correctly refuse to create a new
worktree, we have already updated the branch and mess up the other
checkout.

Repeat the die_if_checked_out() test again for this specific case before
"git branch" runs.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2016-02-15 20:35:33 +07:00 committed by Junio C Hamano
parent 0ebf4a2af3
commit beb6f24bee
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/worktree.c
View File

@ -334,9 +334,18 @@ static int add(int ac, const char **av, const char *prefix)
branch = ac < 2 ? "HEAD" : av[1]; branch = ac < 2 ? "HEAD" : av[1];
opts.force_new_branch = !!new_branch_force; opts.force_new_branch = !!new_branch_force;
if (opts.force_new_branch) if (opts.force_new_branch) {
struct strbuf symref = STRBUF_INIT;
opts.new_branch = new_branch_force; opts.new_branch = new_branch_force;
if (!opts.force &&
!strbuf_check_branch_ref(&symref, opts.new_branch) &&
ref_exists(symref.buf))
die_if_checked_out(symref.buf);
strbuf_release(&symref);
}
if (ac < 2 && !opts.new_branch && !opts.detach) { if (ac < 2 && !opts.new_branch && !opts.detach) {
int n; int n;
const char *s = worktree_basename(path, &n); const char *s = worktree_basename(path, &n);

7
t/t2025-worktree-add.sh
View File

@ -193,6 +193,13 @@ test_expect_success '"add" -B/--detach mutually exclusive' '
test_must_fail git worktree add -B poodle --detach bamboo master test_must_fail git worktree add -B poodle --detach bamboo master
' '
test_expect_success '"add -B" fails if the branch is checked out' '
git rev-parse newmaster >before &&
test_must_fail git worktree add -B newmaster bamboo master &&
git rev-parse newmaster >after &&
test_cmp before after
'
test_expect_success 'add -B' ' test_expect_success 'add -B' '
git worktree add -B poodle bamboo2 master^ && git worktree add -B poodle bamboo2 master^ &&
git -C bamboo2 symbolic-ref HEAD >actual && git -C bamboo2 symbolic-ref HEAD >actual &&