[PATCH] Fix incorrect ref namespace check
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Jan 5, 2012, 12:35 UTC
- Message-ID
- <1325766924-14943-1-git-send-email-pclouds@gmail.com>
The reason why the trailing slash is needed is obvious. refs/stash is not a namespace, but a single ref. Do full string compare on it.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/fetch.c | 2 +- builtin/remote.c | 2 +- log-tree.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index 33ad3aa..daa68d2 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -573,7 +573,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 583eec9..f54a89a 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -534,7 +534,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, diff --git a/log-tree.c b/log-tree.c index 319bd31..9a88fcc 100644 --- a/log-tree.c +++ b/log-tree.c @@ -119,7 +119,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in type = DECORATION_REF_REMOTE; else if (!prefixcmp(refname, "refs/tags/")) type = DECORATION_REF_TAG; - else if (!prefixcmp(refname, "refs/stash")) + else if (!strcmp(refname, "refs/stash")) type = DECORATION_REF_STASH; else if (!prefixcmp(refname, "HEAD")) type = DECORATION_REF_HEAD;
-- 1.7.8.36.g69ee2