Merge branch 'rs/refspec-leakfix'

[thirdparty/git.git] / remote.c

diff --git a/remote.c b/remote.c
index c5ed74f91c63b090ddd916c4fa235a0ebf62f558..eafc14cbe759ed98096e68ce196013a3b026c67a 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -287,19 +287,15 @@ static void read_branches_file(struct remote *remote)
                frag = (char *)git_default_branch_name();
 
        add_url_alias(remote, strbuf_detach(&buf, NULL));
-       strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s",
-                   frag, remote->name);
-       refspec_append(&remote->fetch, buf.buf);
+       refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
+                       frag, remote->name);
 
        /*
         * Cogito compatible push: push current HEAD to remote #branch
         * (master if missing)
         */
-       strbuf_reset(&buf);
-       strbuf_addf(&buf, "HEAD:refs/heads/%s", frag);
-       refspec_append(&remote->push, buf.buf);
+       refspec_appendf(&remote->push, "HEAD:refs/heads/%s", frag);
        remote->fetch_tags = 1; /* always auto-follow */
-       strbuf_release(&buf);
 }
 
 static int handle_config(const char *key, const char *value, void *cb)
@@ -1558,7 +1554,7 @@ static void set_merge(struct branch *ret)
                    strcmp(ret->remote_name, "."))
                        continue;
                if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
-                            &oid, &ref) == 1)
+                            &oid, &ref, 0) == 1)
                        ret->merge[i]->dst = ref;
                else
                        ret->merge[i]->dst = xstrdup(ret->merge_name[i]);