aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-01-05 19:39:40 +0700
committerJunio C Hamano <gitster@pobox.com>2012-01-11 12:52:12 -0800
commit97ba642bcf918de028b2e77165c5210cf3f462e5 (patch)
tree7e9e06846d27d3ddcbbf0328b97c52a943e444d0 /builtin
parent8311158c66e0d83df950ea837fb1cb332c51f798 (diff)
downloadgit-97ba642bcf918de028b2e77165c5210cf3f462e5.tar.gz
git-97ba642bcf918de028b2e77165c5210cf3f462e5.tar.xz
Fix incorrect ref namespace check
The reason why the trailing slash is needed is obvious. refs/stash and HEAD are not namespace, but complete refs. Do full string compare on them. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fetch.c2
-rw-r--r--builtin/remote.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 8761a33b4..ea45cb0e8 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -574,7 +574,7 @@ static void find_non_local_tags(struct transport *transport,
for_each_ref(add_existing, &existing_refs);
for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
- if (prefixcmp(ref->name, "refs/tags"))
+ if (prefixcmp(ref->name, "refs/tags/"))
continue;
/*
diff --git a/builtin/remote.c b/builtin/remote.c
index c81064381..164626b1d 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -535,7 +535,7 @@ static int add_branch_for_removal(const char *refname,
}
/* don't delete non-remote-tracking refs */
- if (prefixcmp(refname, "refs/remotes")) {
+ if (prefixcmp(refname, "refs/remotes/")) {
/* advise user how to delete local branches */
if (!prefixcmp(refname, "refs/heads/"))
string_list_append(branches->skipped,