attr: read core.attributesfile from git_default_core_config

[git.git] / remote.c

diff --git a/remote.c b/remote.c
index ca42a126ad04514f0ed8378768ebce98cfc5a659..7840d2f9b97b8c100012386aad265d422ec802d0 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -840,7 +840,7 @@ char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
                                                    refspec->dst, &ret))
                                return ret;
                } else if (!strcmp(refspec->src, name))
-                       return strdup(refspec->dst);
+                       return xstrdup(refspec->dst);
        }
        return NULL;
 }
@@ -896,7 +896,7 @@ struct ref *alloc_ref(const char *name)
        return alloc_ref_with_prefix("", 0, name);
 }
 
-static struct ref *copy_ref(const struct ref *ref)
+struct ref *copy_ref(const struct ref *ref)
 {
        struct ref *cpy;
        size_t len;
@@ -1667,7 +1667,9 @@ struct ref *guess_remote_head(const struct ref *head,
 
        /* Look for another ref that points there */
        for (r = refs; r; r = r->next) {
-               if (r != head && !hashcmp(r->old_sha1, head->old_sha1)) {
+               if (r != head &&
+                   !prefixcmp(r->name, "refs/heads/") &&
+                   !hashcmp(r->old_sha1, head->old_sha1)) {
                        *tail = copy_ref(r);
                        tail = &((*tail)->next);
                        if (!all)