Convert remaining callers of get_sha1 to get_oid.

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

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index cabdc55e0933adb09d459a5a0747c718fd2c7d1e..136c44def778fa64a4a79074413d08aeedcb7991 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -919,9 +919,9 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
  */
 static int head_has_history(void)
 {
  */
 static int head_has_history(void)
 {

-       unsigned char sha1[20];
+       struct object_id oid;

 
 

-       return !get_sha1("HEAD", sha1);
+       return !get_oid("HEAD", &oid);

 }
 
 static const char *push_to_deploy(unsigned char *sha1,
 }
 
 static const char *push_to_deploy(unsigned char *sha1,

diff --git a/mailmap.c b/mailmap.c
index c1a79c100c9a71083a58401081fb2929420ce361..cb921b4db676e3db918ee16f419cd2b78e0bf57e 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -214,17 +214,17 @@ static int read_mailmap_blob(struct string_list *map,
                             const char *name,
                             char **repo_abbrev)
 {
                             const char *name,
                             char **repo_abbrev)
 {

-       unsigned char sha1[20];
+       struct object_id oid;

        char *buf;
        unsigned long size;
        enum object_type type;
 
        if (!name)
                return 0;
        char *buf;
        unsigned long size;
        enum object_type type;
 
        if (!name)
                return 0;

-       if (get_sha1(name, sha1) < 0)
+       if (get_oid(name, &oid) < 0)

                return 0;
 
                return 0;
 

-       buf = read_sha1_file(sha1, &type, &size);
+       buf = read_sha1_file(oid.hash, &type, &size);

        if (!buf)
                return error("unable to read mailmap object at %s", name);
        if (type != OBJ_BLOB)
        if (!buf)
                return error("unable to read mailmap object at %s", name);
        if (type != OBJ_BLOB)