Sync with 2.14.6

[thirdparty/git.git] / transport-helper.c

diff --git a/transport-helper.c b/transport-helper.c
index af519c1ff741a8a58f5c5c80381867aae45cea79..f24e776a675b7fb616c5237f95294baa70c7c1a0 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -604,6 +604,7 @@ static int process_connect_service(struct transport *transport,
                        cmdbuf.buf);
 
 exit:
+       strbuf_release(&cmdbuf);
        fclose(input);
        return ret;
 }
@@ -927,7 +928,7 @@ static int push_refs_with_export(struct transport *transport,
                struct object_id oid;
 
                private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
-               if (private && !get_sha1(private, oid.hash)) {
+               if (private && !get_oid(private, &oid)) {
                        strbuf_addf(&buf, "^%s", private);
                        string_list_append(&revlist_args, strbuf_detach(&buf, NULL));
                        oidcpy(&ref->old_oid, &oid);