diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-02 14:24:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-02 14:24:05 -0700 |
commit | a4127142c621c03cb0967d298ac0ea1e673162fd (patch) | |
tree | e6383127a5b555b4637c1100da78c0168276623a /builtin | |
parent | Merge branch 'jk/check-repository-format' into maint (diff) | |
parent | branch -d: refuse deleting a branch which is currently checked out (diff) | |
download | tgif-a4127142c621c03cb0967d298ac0ea1e673162fd.tar.xz |
Merge branch 'ky/branch-d-worktree' into maint
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
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/branch.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 7b45b6bd6b..8885d9f8e2 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -20,6 +20,7 @@ #include "utf8.h" #include "wt-status.h" #include "ref-filter.h" +#include "worktree.h" static const char * const builtin_branch_usage[] = { 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; strbuf_branchname(&bname, argv[i]); - if (kinds == FILTER_REFS_BRANCHES && !strcmp(head, bname.buf)) { - error(_("Cannot delete the branch '%s' " - "which you are currently on."), bname.buf); - ret = 1; - continue; - } - free(name); - name = mkpathdup(fmt, bname.buf); + + if (kinds == FILTER_REFS_BRANCHES) { + 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; + } + } + target = resolve_ref_unsafe(name, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE |