Start 1.6.2 cycle

diff --git a/remote.c b/remote.c
index 8a04066d6142823183033aaff8754febe31ad1b0..570e11286ea295e825a23b1d5ed40c9fbd02be57 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -201,6 +201,7 @@ static void read_remotes_file(struct remote *remote)
 
        if (!f)
                return;
+       remote->origin = REMOTE_REMOTES;
        while (fgets(buffer, BUF_SIZE, f)) {
                int value_list;
                char *s, *p;
@@ -261,6 +262,7 @@ static void read_branches_file(struct remote *remote)
                s++;
        if (!*s)
                return;
+       remote->origin = REMOTE_BRANCHES;
        p = s + strlen(s);
        while (isspace(p[-1]))
                *--p = 0;
@@ -297,6 +299,17 @@ static void read_branches_file(struct remote *remote)
        }
        add_url_alias(remote, p);
        add_fetch_refspec(remote, strbuf_detach(&branch, 0));
+       /*
+        * Cogito compatible push: push current HEAD to remote #branch
+        * (master if missing)
+        */
+       strbuf_init(&branch, 0);
+       strbuf_addstr(&branch, "HEAD");
+       if (frag)
+               strbuf_addf(&branch, ":refs/heads/%s", frag);
+       else
+               strbuf_addstr(&branch, ":refs/heads/master");
+       add_push_refspec(remote, strbuf_detach(&branch, 0));
        remote->fetch_tags = 1; /* always auto-follow */
 }
 
@@ -350,6 +363,7 @@ static int handle_config(const char *key, const char *value, void *cb)
        if (!subkey)
                return error("Config with no key for remote %s", name);
        remote = make_remote(name, subkey - name);
+       remote->origin = REMOTE_CONFIG;
        if (!strcmp(subkey, ".mirror"))
                remote->mirror = git_config_bool(key, value);
        else if (!strcmp(subkey, ".skipdefaultupdate"))
@@ -749,17 +763,19 @@ int remote_find_tracking(struct remote *remote, struct refspec *refspec)
        return -1;
 }
 
-struct ref *alloc_ref(unsigned namelen)
+static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
+               const char *name)
 {
-       struct ref *ret = xcalloc(1, sizeof(struct ref) + namelen);
-       return ret;
+       size_t len = strlen(name);
+       struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
+       memcpy(ref->name, prefix, prefixlen);
+       memcpy(ref->name + prefixlen, name, len);
+       return ref;
 }
 
-struct ref *alloc_ref_from_str(const char* str)
+struct ref *alloc_ref(const char *name)
 {
-       struct ref *ret = alloc_ref(strlen(str) + 1);
-       strcpy(ret->name, str);
-       return ret;
+       return alloc_ref_with_prefix("", 0, name);
 }
 
 static struct ref *copy_ref(const struct ref *ref)
@@ -870,21 +886,20 @@ static struct ref *try_explicit_object_name(const char *name)
        struct ref *ref;
 
        if (!*name) {
-               ref = alloc_ref(20);
-               strcpy(ref->name, "(delete)");
+               ref = alloc_ref("(delete)");
                hashclr(ref->new_sha1);
                return ref;
        }
        if (get_sha1(name, sha1))
                return NULL;
-       ref = alloc_ref_from_str(name);
+       ref = alloc_ref(name);
        hashcpy(ref->new_sha1, sha1);
        return ref;
 }
 
 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
 {
-       struct ref *ret = alloc_ref_from_str(name);
+       struct ref *ret = alloc_ref(name);
        tail_link_ref(ret, tail);
        return ret;
 }
@@ -1152,10 +1167,8 @@ static struct ref *get_expanded_map(const struct ref *remote_refs,
                        struct ref *cpy = copy_ref(ref);
                        match = ref->name + remote_prefix_len;
 
-                       cpy->peer_ref = alloc_ref(local_prefix_len +
-                                                 strlen(match) + 1);
-                       sprintf(cpy->peer_ref->name, "%s%s",
-                               refspec->dst, match);
+                       cpy->peer_ref = alloc_ref_with_prefix(refspec->dst,
+                                       local_prefix_len, match);
                        if (refspec->force)
                                cpy->peer_ref->force = 1;
                        *tail = cpy;
@@ -1188,25 +1201,18 @@ struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
 
 static struct ref *get_local_ref(const char *name)
 {
-       struct ref *ret;
        if (!name)
                return NULL;
 
-       if (!prefixcmp(name, "refs/")) {
-               return alloc_ref_from_str(name);
-       }
+       if (!prefixcmp(name, "refs/"))
+               return alloc_ref(name);
 
        if (!prefixcmp(name, "heads/") ||
            !prefixcmp(name, "tags/") ||
-           !prefixcmp(name, "remotes/")) {
-               ret = alloc_ref(strlen(name) + 6);
-               sprintf(ret->name, "refs/%s", name);
-               return ret;
-       }
+           !prefixcmp(name, "remotes/"))
+               return alloc_ref_with_prefix("refs/", 5, name);
 
-       ret = alloc_ref(strlen(name) + 12);
-       sprintf(ret->name, "refs/heads/%s", name);
-       return ret;
+       return alloc_ref_with_prefix("refs/heads/", 11, name);
 }
 
 int get_fetch_map(const struct ref *remote_refs,