diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-01-05 19:39:40 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-11 12:52:12 -0800 |
| commit | 97ba642bcf918de028b2e77165c5210cf3f462e5 (patch) | |
| tree | 7e9e06846d27d3ddcbbf0328b97c52a943e444d0 | |
| parent | 8311158c66e0d83df950ea837fb1cb332c51f798 (diff) | |
| download | git-nd/maint-refname-in-hierarchy-check.tar.gz | |
Fix incorrect ref namespace checknd/maint-refname-in-hierarchy-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>
| -rw-r--r-- | builtin/fetch.c | 2 | ||||
| -rw-r--r-- | builtin/remote.c | 2 | ||||
| -rw-r--r-- | log-tree.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 8761a33b49..ea45cb0e8e 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 c810643815..164626b1d1 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, diff --git a/log-tree.c b/log-tree.c index e7694a3a4c..21ac9047c0 100644 --- a/log-tree.c +++ b/log-tree.c @@ -119,9 +119,9 @@ 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")) + else if (!strcmp(refname, "HEAD")) type = DECORATION_REF_HEAD; if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS) |