remote: convert struct push_cas to struct object_id

This gets rid of one use of get_sha1.

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

diff --git a/remote.c b/remote.c
index d87482573d38b057257c08024fbe6b4339661481..9da9040bf01e154c818bae90852fae5df84cd0d5 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -2294,8 +2294,8 @@ static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, i
        if (!*colon)
                entry->use_tracking = 1;
        else if (!colon[1])
        if (!*colon)
                entry->use_tracking = 1;
        else if (!colon[1])

-               hashclr(entry->expect);
-       else if (get_sha1(colon + 1, entry->expect))
+               oidclr(&entry->expect);
+       else if (get_oid(colon + 1, &entry->expect))

                return error("cannot parse expected object name '%s'", colon + 1);
        return 0;
 }
                return error("cannot parse expected object name '%s'", colon + 1);
        return 0;
 }


@@ -2342,7 +2342,7 @@ static void apply_cas(struct push_cas_option *cas,
                        continue;
                ref->expect_old_sha1 = 1;
                if (!entry->use_tracking)
                        continue;
                ref->expect_old_sha1 = 1;
                if (!entry->use_tracking)

-                       hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
+                       oidcpy(&ref->old_oid_expect, &entry->expect);

                else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
                        oidclr(&ref->old_oid_expect);
                return;
                else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
                        oidclr(&ref->old_oid_expect);
                return;

diff --git a/remote.h b/remote.h
index 6c28cd3e4bfe2e8be058485d0b963b23622b999f..2ecf4c8c74ce590c9bcc917d997b3c7acf9c07c1 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -282,7 +282,7 @@ struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fet
 struct push_cas_option {
        unsigned use_tracking_for_rest:1;
        struct push_cas {
 struct push_cas_option {
        unsigned use_tracking_for_rest:1;
        struct push_cas {

-               unsigned char expect[20];
+               struct object_id expect;

                unsigned use_tracking:1;
                char *refname;
        } *entry;
                unsigned use_tracking:1;
                char *refname;
        } *entry;