git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 5f9432861bdc4326a58cebfc05fdb96a9b3a7616..65f4a4c83c42ec33d5ffe3f1d83d7b5465c0796d 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -485,7 +485,7 @@ static void snarf_refs(int head, int remotes)
 static int rev_is_head(const char *head, const char *name,
                       unsigned char *head_sha1, unsigned char *sha1)
 {
-       if (!head || (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
+       if (!head || (head_sha1 && sha1 && !hasheq(head_sha1, sha1)))
                return 0;
        skip_prefix(head, "refs/heads/", &head);
        if (!skip_prefix(name, "refs/heads/", &name))