http-push: remove remaining uses of sha1_to_hex

Since sha1_to_hex is limited to SHA-1, switch all remaining uses of it
in this file to hash_to_hex or oid_to_hex.  Modify update_remote to take
a pointer to struct object_id, and since we don't modify that parameter
in the function, set it to be const as well.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-push.c b/http-push.c
index c4e5142bc9e5457162cef25a7fbe4f662f335c19..f675a9631662ef5f6841b376e352b7b159e52e14 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -316,7 +316,7 @@ static void start_fetch_packed(struct transfer_request *request)
        }
 
        fprintf(stderr, "Fetching pack %s\n",
        }
 
        fprintf(stderr, "Fetching pack %s\n",

-               sha1_to_hex(target->hash));
+               hash_to_hex(target->hash));

        fprintf(stderr, " which contains %s\n", oid_to_hex(&request->obj->oid));
 
        preq = new_http_pack_request(target, repo->url);
        fprintf(stderr, " which contains %s\n", oid_to_hex(&request->obj->oid));
 
        preq = new_http_pack_request(target, repo->url);


@@ -1374,7 +1374,7 @@ static int get_delta(struct rev_info *revs, struct remote_lock *lock)
        return count;
 }
 
        return count;
 }
 

-static int update_remote(unsigned char *sha1, struct remote_lock *lock)
+static int update_remote(const struct object_id *oid, struct remote_lock *lock)

 {
        struct active_request_slot *slot;
        struct slot_results results;
 {
        struct active_request_slot *slot;
        struct slot_results results;


@@ -1383,7 +1383,7 @@ static int update_remote(unsigned char *sha1, struct remote_lock *lock)
 
        dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
 
 
        dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
 

-       strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1));
+       strbuf_addf(&out_buffer.buf, "%s\n", oid_to_hex(oid));

 
        slot = get_active_slot();
        slot->results = &results;
 
        slot = get_active_slot();
        slot->results = &results;


@@ -1948,7 +1948,7 @@ int cmd_main(int argc, const char **argv)
                run_request_queue();
 
                /* Update the remote branch if all went well */
                run_request_queue();
 
                /* Update the remote branch if all went well */

-               if (aborted || !update_remote(ref->new_oid.hash, ref_lock))
+               if (aborted || !update_remote(&ref->new_oid, ref_lock))

                        rc = 1;
 
                if (!rc)
                        rc = 1;
 
                if (!rc)