aboutsummaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2012-10-18 14:05:17 +0200
committerJunio C Hamano <gitster@pobox.com>2012-10-18 14:36:16 -0700
commit566c7707db4eb18a116659b08d6ff7ad79fcfefd (patch)
tree1be45a8788e1c07c3f8843364e17c33b92a964ba /builtin/branch.c
parent22ed79275360a3dbb480e2c510a94c4b817afad2 (diff)
downloadgit-566c7707db4eb18a116659b08d6ff7ad79fcfefd.tar.gz
git-566c7707db4eb18a116659b08d6ff7ad79fcfefd.tar.xz
branch: delete symref branch, not its target
If a branch that is to be deleted happens to be a symref to another branch, the current code removes the targeted branch instead of the one it was called for. Change this surprising behaviour and delete the symref branch instead. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 97c736115..5e1e5b4d6 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -239,7 +239,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
continue;
}
- if (delete_ref(name, sha1, 0)) {
+ if (delete_ref(name, sha1, REF_NODEREF)) {
error(remote_branch
? _("Error deleting remote branch '%s'")
: _("Error deleting branch '%s'"),