kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ky/branch-d-worktree' 

When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree

* ky/branch-d-worktree:
  branch -d: refuse deleting a branch which is currently checked out
maint
Junio C Hamano 2016-04-13 14:12:30 -07:00
parent 0d8683c552 f292244c04
commit 4fca4e37db
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/branch.c
View File

@ -20,6 +20,7 @@
#include "utf8.h" #include "utf8.h"
#include "wt-status.h" #include "wt-status.h"
#include "ref-filter.h" #include "ref-filter.h"
#include "worktree.h"


static const char * const builtin_branch_usage[] = { static const char * const builtin_branch_usage[] = {
N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"), N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
@ -215,16 +216,21 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
int flags = 0; int flags = 0;


strbuf_branchname(&bname, argv[i]); strbuf_branchname(&bname, argv[i]);
if (kinds == FILTER_REFS_BRANCHES && !strcmp(head, bname.buf)) { free(name);
error(_("Cannot delete the branch '%s' " name = mkpathdup(fmt, bname.buf);
"which you are currently on."), bname.buf);
ret = 1; if (kinds == FILTER_REFS_BRANCHES) {
continue; char *worktree = find_shared_symref("HEAD", name);
if (worktree) {
error(_("Cannot delete branch '%s' "
"checked out at '%s'"),
bname.buf, worktree);
free(worktree);
ret = 1;
continue;
}
} }


free(name);

name = mkpathdup(fmt, bname.buf);
target = resolve_ref_unsafe(name, target = resolve_ref_unsafe(name,
RESOLVE_REF_READING RESOLVE_REF_READING
| RESOLVE_REF_NO_RECURSE | RESOLVE_REF_NO_RECURSE

6
t/t3200-branch.sh
View File

@ -403,6 +403,12 @@ test_expect_success 'test deleting branch without config' '
test_i18ncmp expect actual test_i18ncmp expect actual
' '


test_expect_success 'deleting currently checked out branch fails' '
git worktree add -b my7 my7 &&
test_must_fail git -C my7 branch -d my7 &&
test_must_fail git branch -d my7
'

test_expect_success 'test --track without .fetch entries' ' test_expect_success 'test --track without .fetch entries' '
git branch --track my8 && git branch --track my8 &&
test "$(git config branch.my8.remote)" && test "$(git config branch.my8.remote)" &&