From 3b9dcff5df97ab642de48bc1ce781961686081aa Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 8 Mar 2008 23:40:42 +0100 Subject: [PATCH] builtin remote rm: remove symbolic refs, too "git remote add" can add a symbolic ref "HEAD", and "rm" should delete it, too. Noticed by Teemu Likonen. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- builtin-remote.c | 5 +++++ t/t5505-remote.sh | 1 + 2 files changed, 6 insertions(+) diff --git a/builtin-remote.c b/builtin-remote.c index ca3bf265a9..637b90425e 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -264,6 +264,11 @@ static int add_branch_for_removal(const char *refname, if (!prefixcmp(refname, branches->prefix)) { struct path_list_item *item; + + /* make sure that symrefs are deleted */ + if (flags & REF_ISSYMREF) + return unlink(git_path(refname)); + item = path_list_append(refname, branches->branches); item->util = xmalloc(20); hashcpy(item->util, sha1); diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index f45ea68f63..2822a651b5 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -80,6 +80,7 @@ test_expect_success 'add another remote' ' test_expect_success 'remove remote' ' ( cd test && + git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master && git remote rm second ) '