sha1_name: convert struct min_abbrev_data to object_id

This structure is only written to in one place, where we already have a
struct object_id.  Convert the struct to use a struct object_id instead.

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

diff --git a/sha1_name.c b/sha1_name.c
index 39e911c8bab21535ea6aef88c612cd282788e495..16e0003396c3a169b33d3519d7f984d3b6e11228 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -480,7 +480,7 @@ struct min_abbrev_data {
        unsigned int init_len;
        unsigned int cur_len;
        char *hex;
        unsigned int init_len;
        unsigned int cur_len;
        char *hex;

-       const unsigned char *hash;
+       const struct object_id *oid;

 };
 
 static inline char get_hex_char_from_oid(const struct object_id *oid,
 };
 
 static inline char get_hex_char_from_oid(const struct object_id *oid,


@@ -526,7 +526,7 @@ static void find_abbrev_len_for_pack(struct packed_git *p,
                int cmp;
 
                current = nth_packed_object_sha1(p, mid);
                int cmp;
 
                current = nth_packed_object_sha1(p, mid);

-               cmp = hashcmp(mad->hash, current);
+               cmp = hashcmp(mad->oid->hash, current);

                if (!cmp) {
                        match = 1;
                        first = mid;
                if (!cmp) {
                        match = 1;
                        first = mid;


@@ -603,7 +603,7 @@ int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len)
        mad.init_len = len;
        mad.cur_len = len;
        mad.hex = hex;
        mad.init_len = len;
        mad.cur_len = len;
        mad.hex = hex;

-       mad.hash = oid->hash;
+       mad.oid = oid;

 
        find_abbrev_len_packed(&mad);
 
 
        find_abbrev_len_packed(&mad);