ref_newer: convert to use struct object_id

Convert ref_newer and its caller to use struct object_id instead of
unsigned char *.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>

diff --git a/builtin/remote.c b/builtin/remote.c
index 68dec162aaa0ff536c30a7ec8c2e3f951c7e86a5..6694cf20efdc01fb59d0b6afa41f7b1557c9b2d5 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -417,7 +417,7 @@ static int get_push_ref_states(const struct ref *remote_refs,
                else if (is_null_oid(&ref->old_oid))
                        info->status = PUSH_STATUS_CREATE;
                else if (has_object_file(&ref->old_oid) &&
                else if (is_null_oid(&ref->old_oid))
                        info->status = PUSH_STATUS_CREATE;
                else if (has_object_file(&ref->old_oid) &&

-                        ref_newer(ref->new_oid.hash, ref->old_oid.hash))
+                        ref_newer(&ref->new_oid, &ref->old_oid))

                        info->status = PUSH_STATUS_FASTFORWARD;
                else
                        info->status = PUSH_STATUS_OUTOFDATE;
                        info->status = PUSH_STATUS_FASTFORWARD;
                else
                        info->status = PUSH_STATUS_OUTOFDATE;

diff --git a/http-push.c b/http-push.c
index f2db3a6243bb48de4f37febc2da3db7c5d5b9874..68ce3405fe9bdcbeaab299d5b22509257467b909 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1886,8 +1886,8 @@ int main(int argc, char **argv)
                    !is_null_oid(&ref->old_oid) &&
                    !ref->force) {
                        if (!has_object_file(&ref->old_oid) ||
                    !is_null_oid(&ref->old_oid) &&
                    !ref->force) {
                        if (!has_object_file(&ref->old_oid) ||

-                           !ref_newer(ref->peer_ref->new_oid.hash,
-                                      ref->old_oid.hash)) {
+                           !ref_newer(&ref->peer_ref->new_oid,
+                                      &ref->old_oid)) {

                                /*
                                 * We do not have the remote ref, or
                                 * we know that the remote ref is not
                                /*
                                 * We do not have the remote ref, or
                                 * we know that the remote ref is not

diff --git a/remote.c b/remote.c
index 4beebadcc3257240cbd73285403be8c69ab9bc41..bdae86c618105affd40a65e9543d82162c122447 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1590,7 +1590,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
                        else if (!lookup_commit_reference_gently(ref->old_oid.hash, 1) ||
                                 !lookup_commit_reference_gently(ref->new_oid.hash, 1))
                                reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
                        else if (!lookup_commit_reference_gently(ref->old_oid.hash, 1) ||
                                 !lookup_commit_reference_gently(ref->new_oid.hash, 1))
                                reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;

-                       else if (!ref_newer(ref->new_oid.hash, ref->old_oid.hash))
+                       else if (!ref_newer(&ref->new_oid, &ref->old_oid))

                                reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
                }
 
                                reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
                }
 


@@ -1944,7 +1944,7 @@ static void unmark_and_free(struct commit_list *list, unsigned int mark)
        }
 }
 
        }
 }
 

-int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
+int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)

 {
        struct object *o;
        struct commit *old, *new;
 {
        struct object *o;
        struct commit *old, *new;


@@ -1955,12 +1955,12 @@ int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
         * Both new and old must be commit-ish and new is descendant of
         * old.  Otherwise we require --force.
         */
         * Both new and old must be commit-ish and new is descendant of
         * old.  Otherwise we require --force.
         */

-       o = deref_tag(parse_object(old_sha1), NULL, 0);
+       o = deref_tag(parse_object(old_oid->hash), NULL, 0);

        if (!o || o->type != OBJ_COMMIT)
                return 0;
        old = (struct commit *) o;
 
        if (!o || o->type != OBJ_COMMIT)
                return 0;
        old = (struct commit *) o;
 

-       o = deref_tag(parse_object(new_sha1), NULL, 0);
+       o = deref_tag(parse_object(new_oid->hash), NULL, 0);

        if (!o || o->type != OBJ_COMMIT)
                return 0;
        new = (struct commit *) o;
        if (!o || o->type != OBJ_COMMIT)
                return 0;
        new = (struct commit *) o;

diff --git a/remote.h b/remote.h
index 163ea5e8d0ea65a9f7d7567d9ba113de0c6771ed..4a039bae0b15d6d28aace0c62287c3f3bb11befa 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -150,7 +150,7 @@ extern struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
                                     struct sha1_array *shallow);
 
 int resolve_remote_symref(struct ref *ref, struct ref *list);
                                     struct sha1_array *shallow);
 
 int resolve_remote_symref(struct ref *ref, struct ref *list);

-int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1);
+int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid);

 
 /*
  * Remove and free all but the first of any entries in the input list
 
 /*
  * Remove and free all but the first of any entries in the input list