aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2016-06-18 06:15:11 +0200
committerJunio C Hamano <gitster@pobox.com>2016-06-20 11:38:18 -0700
commit29a7cf96441241a291edca8136ab3cc80201e7ee (patch)
tree883fa183dd1da8903da9222c02562ce07dc5cd96 /builtin
parentc5f04dddb6cf5f76adfe145de3565411711255b8 (diff)
downloadgit-29a7cf96441241a291edca8136ab3cc80201e7ee.tar.gz
git-29a7cf96441241a291edca8136ab3cc80201e7ee.tar.xz
remote rm: handle symbolic refs correctly
In the modern world of reference backends, it is not OK to delete a symref by unlink()ing the file directly. This must be done via the refs API. We do so by adding the symref to the list of references to delete along with the non-symbolic references, then calling delete_refs() with the new flags option set to REF_NODEREF. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/remote.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin/remote.c b/builtin/remote.c
index 1bbf9b44d..c4b4d674b 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -539,10 +539,6 @@ static int add_branch_for_removal(const char *refname,
return 0;
}
- /* make sure that symrefs are deleted */
- if (flags & REF_ISSYMREF)
- return unlink(git_path("%s", refname));
-
string_list_append(branches->branches, refname);
return 0;
@@ -788,7 +784,7 @@ static int rm(int argc, const char **argv)
strbuf_release(&buf);
if (!result)
- result = delete_refs(&branches, 0);
+ result = delete_refs(&branches, REF_NODEREF);
string_list_clear(&branches, 0);
if (skipped.nr) {