From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kazuki Yamaguchi Subject: [PATCH v3] branch -d: refuse deleting a branch which is currently checked out Date: Tue, 29 Mar 2016 18:38:39 +0900 Message-ID: <1459244319-21241-1-git-send-email-k@rhe.jp> References: Cc: Eric Sunshine , Junio C Hamano , Kazuki Yamaguchi To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Mar 29 11:45:48 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1akq7C-0004oP-E9 for gcvg-git-2@plane.gmane.org; Tue, 29 Mar 2016 11:39:10 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756265AbcC2JjA (ORCPT ); Tue, 29 Mar 2016 05:39:00 -0400 Received: from 116.58.164.79.static.zoot.jp ([116.58.164.79]:54190 "EHLO walnut.rhe.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751122AbcC2Ji6 (ORCPT ); Tue, 29 Mar 2016 05:38:58 -0400 Received: from chikuwa.rhe.jp (unknown [10.0.1.1]) by walnut.rhe.jp (Postfix) with ESMTPSA id 65D9D5C863; Tue, 29 Mar 2016 09:38:56 +0000 (UTC) X-Mailer: git-send-email 2.8.0.rc4.17.g02aa164.dirty In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: When a branch is checked out by current working tree, deleting the branch is forbidden. However when the branch is checked out only by other working trees, deleting incorrectly succeeds. Use find_shared_symref() to check if the branch is in use, not just comparing with the current working tree's HEAD. Helped-by: Eric Sunshine Signed-off-by: Kazuki Yamaguchi --- Changes from v2: - Amended commit message - Dropped "which is" from error message The previous versions of the patch are: - [v1] http://thread.gmane.org/gmane.comp.version-control.git/289413/focus=289932 - [v2] http://thread.gmane.org/gmane.comp.version-control.git/289413/focus=290027 builtin/branch.c | 22 ++++++++++++++-------- t/t3200-branch.sh | 6 ++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 7b45b6bd6b80..8885d9f8e2cd 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 [] [-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 diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index a89724849065..508007fd3772 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -403,6 +403,12 @@ test_expect_success 'test deleting branch without config' ' 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' ' git branch --track my8 && test "$(git config branch.my8.remote)" && -- 2.8.0.rc4.17.g02aa164.dirty