sha1_file: convert read_sha1_file to struct object_id

Convert read_sha1_file to take a pointer to struct object_id and rename
it read_object_file.  Do the same for read_sha1_file_extended.

Convert one use in grep.c to use the new function without any other code
change, since the pointer being passed is a void pointer that is already
initialized with a pointer to struct object_id.  Update the declaration
and definitions of the modified functions, and apply the following
semantic patch to convert the remaining callers:

@@
expression E1, E2, E3;
@@
- read_sha1_file(E1.hash, E2, E3)
+ read_object_file(&E1, E2, E3)

@@
expression E1, E2, E3;
@@
- read_sha1_file(E1->hash, E2, E3)
+ read_object_file(E1, E2, E3)

@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1.hash, E2, E3, E4)
+ read_object_file_extended(&E1, E2, E3, E4)

@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1->hash, E2, E3, E4)
+ read_object_file_extended(E1, E2, E3, E4)

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

diff --git a/apply.c b/apply.c
index f8f15edc7c7b2b409201b6168a68fdd96ed0c0ba..b1e1bd58bfa33f0568c5b9e3414441eb88ce9b1b 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -3180,7 +3180,7 @@ static int apply_binary(struct apply_state *state,
                unsigned long size;
                char *result;
 
                unsigned long size;
                char *result;
 

-               result = read_sha1_file(oid.hash, &type, &size);
+               result = read_object_file(&oid, &type, &size);

                if (!result)
                        return error(_("the necessary postimage %s for "
                                       "'%s' cannot be read"),
                if (!result)
                        return error(_("the necessary postimage %s for "
                                       "'%s' cannot be read"),


@@ -3242,7 +3242,7 @@ static int read_blob_object(struct strbuf *buf, const struct object_id *oid, uns
                unsigned long sz;
                char *result;
 
                unsigned long sz;
                char *result;
 

-               result = read_sha1_file(oid->hash, &type, &sz);
+               result = read_object_file(oid, &type, &sz);

                if (!result)
                        return -1;
                /* XXX read_sha1_file NUL-terminates */
                if (!result)
                        return -1;
                /* XXX read_sha1_file NUL-terminates */

diff --git a/archive.c b/archive.c
index 1ab62d426e8cd2426294d252f2a78ef94760dee0..93ab175b0b4055bcfbd9334c7ccb36475c33e549 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -72,7 +72,7 @@ void *object_file_to_archive(const struct archiver_args *args,
        const struct commit *commit = args->convert ? args->commit : NULL;
 
        path += args->baselen;
        const struct commit *commit = args->convert ? args->commit : NULL;
 
        path += args->baselen;

-       buffer = read_sha1_file(oid->hash, type, sizep);
+       buffer = read_object_file(oid, type, sizep);

        if (buffer && S_ISREG(mode)) {
                struct strbuf buf = STRBUF_INIT;
                size_t size = 0;
        if (buffer && S_ISREG(mode)) {
                struct strbuf buf = STRBUF_INIT;
                size_t size = 0;

diff --git a/bisect.c b/bisect.c
index f6d05bd66f42bd9874a08f5585ae99337d22dad5..ad395bb2b8663013102737be78cfc7601cab9abc 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -132,7 +132,8 @@ static void show_list(const char *debug, int counted, int nr,
                unsigned flags = commit->object.flags;
                enum object_type type;
                unsigned long size;
                unsigned flags = commit->object.flags;
                enum object_type type;
                unsigned long size;

-               char *buf = read_sha1_file(commit->object.oid.hash, &type, &size);
+               char *buf = read_object_file(&commit->object.oid, &type,
+                                            &size);

                const char *subject_start;
                int subject_len;
 
                const char *subject_start;
                int subject_len;
 

diff --git a/blame.c b/blame.c
index cc2cc9294443c9e4267aae7ccbc9dddaf69c4592..78c9808bd1a04a4c641b0f5f853540ea7618a522 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -297,8 +297,8 @@ static void fill_origin_blob(struct diff_options *opt,
                    textconv_object(o->path, o->mode, &o->blob_oid, 1, &file->ptr, &file_size))
                        ;
                else
                    textconv_object(o->path, o->mode, &o->blob_oid, 1, &file->ptr, &file_size))
                        ;
                else

-                       file->ptr = read_sha1_file(o->blob_oid.hash, &type,
-                                                  &file_size);
+                       file->ptr = read_object_file(&o->blob_oid, &type,
+                                                    &file_size);

                file->size = file_size;
 
                if (!file->ptr)
                file->size = file_size;
 
                if (!file->ptr)


@@ -1829,8 +1829,8 @@ void setup_scoreboard(struct blame_scoreboard *sb, const char *path, struct blam
                                    &sb->final_buf_size))
                        ;
                else
                                    &sb->final_buf_size))
                        ;
                else

-                       sb->final_buf = read_sha1_file(o->blob_oid.hash, &type,
-                                                      &sb->final_buf_size);
+                       sb->final_buf = read_object_file(&o->blob_oid, &type,
+                                                        &sb->final_buf_size);

 
                if (!sb->final_buf)
                        die(_("cannot read blob %s for path %s"),
 
                if (!sb->final_buf)
                        die(_("cannot read blob %s for path %s"),

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 4382b4447e4a1ad4d241df8b4792aff943091fea..2c46d257cd9a09a8f8ff05820b53224394385c7d 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -32,7 +32,7 @@ static int filter_object(const char *path, unsigned mode,
 {
        enum object_type type;
 
 {
        enum object_type type;
 

-       *buf = read_sha1_file(oid->hash, &type, size);
+       *buf = read_object_file(oid, &type, size);

        if (!*buf)
                return error(_("cannot read object %s '%s'"),
                             oid_to_hex(oid), path);
        if (!*buf)
                return error(_("cannot read object %s '%s'"),
                             oid_to_hex(oid), path);


@@ -130,7 +130,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 
                if (type == OBJ_BLOB)
                        return stream_blob_to_fd(1, &oid, NULL, 0);
 
                if (type == OBJ_BLOB)
                        return stream_blob_to_fd(1, &oid, NULL, 0);

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

                if (!buf)
                        die("Cannot read object %s", obj_name);
 
                if (!buf)
                        die("Cannot read object %s", obj_name);
 


@@ -141,7 +141,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
                if (type_from_string(exp_type) == OBJ_BLOB) {
                        struct object_id blob_oid;
                        if (oid_object_info(&oid, NULL) == OBJ_TAG) {
                if (type_from_string(exp_type) == OBJ_BLOB) {
                        struct object_id blob_oid;
                        if (oid_object_info(&oid, NULL) == OBJ_TAG) {

-                               char *buffer = read_sha1_file(oid.hash, &type, &size);
+                               char *buffer = read_object_file(&oid, &type,
+                                                               &size);

                                const char *target;
                                if (!skip_prefix(buffer, "object ", &target) ||
                                    get_oid_hex(target, &blob_oid))
                                const char *target;
                                if (!skip_prefix(buffer, "object ", &target) ||
                                    get_oid_hex(target, &blob_oid))


@@ -304,8 +305,9 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
                                enum object_type type;
                                if (!textconv_object(data->rest, 0100644, oid,
                                                     1, &contents, &size))
                                enum object_type type;
                                if (!textconv_object(data->rest, 0100644, oid,
                                                     1, &contents, &size))

-                                       contents = read_sha1_file(oid->hash, &type,
-                                                                 &size);
+                                       contents = read_object_file(oid,
+                                                                   &type,
+                                                                   &size);

                                if (!contents)
                                        die("could not convert '%s' %s",
                                            oid_to_hex(oid), data->rest);
                                if (!contents)
                                        die("could not convert '%s' %s",
                                            oid_to_hex(oid), data->rest);


@@ -321,7 +323,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
                unsigned long size;
                void *contents;
 
                unsigned long size;
                void *contents;
 

-               contents = read_sha1_file(oid->hash, &type, &size);
+               contents = read_object_file(oid, &type, &size);

                if (!contents)
                        die("object %s disappeared", oid_to_hex(oid));
                if (type != data->type)
                if (!contents)
                        die("object %s disappeared", oid_to_hex(oid));
                if (type != data->type)

diff --git a/builtin/difftool.c b/builtin/difftool.c
index bcc79d1888f2217bcb380ffb1e7178c100a41e8e..ee8dce019e1ca04111de185b5f47c12076b32a0c 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -306,7 +306,7 @@ static char *get_symlink(const struct object_id *oid, const char *path)
        } else {
                enum object_type type;
                unsigned long size;
        } else {
                enum object_type type;
                unsigned long size;

-               data = read_sha1_file(oid->hash, &type, &size);
+               data = read_object_file(oid, &type, &size);

                if (!data)
                        die(_("could not read object %s for symlink %s"),
                                oid_to_hex(oid), path);
                if (!data)
                        die(_("could not read object %s for symlink %s"),
                                oid_to_hex(oid), path);

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d75a3a45d3d5dbd41f9a94c040700e6678e8cf9c..a15898d64177b380ea021e3bc63fb91446bc02b3 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -237,7 +237,7 @@ static void export_blob(const struct object_id *oid)
                object = (struct object *)lookup_blob(oid);
                eaten = 0;
        } else {
                object = (struct object *)lookup_blob(oid);
                eaten = 0;
        } else {

-               buf = read_sha1_file(oid->hash, &type, &size);
+               buf = read_object_file(oid, &type, &size);

                if (!buf)
                        die ("Could not read blob %s", oid_to_hex(oid));
                if (check_object_signature(oid, buf, size, type_name(type)) < 0)
                if (!buf)
                        die ("Could not read blob %s", oid_to_hex(oid));
                if (check_object_signature(oid, buf, size, type_name(type)) < 0)


@@ -682,7 +682,7 @@ static void handle_tag(const char *name, struct tag *tag)
                return;
        }
 
                return;
        }
 

-       buf = read_sha1_file(tag->object.oid.hash, &type, &size);
+       buf = read_object_file(&tag->object.oid, &type, &size);

        if (!buf)
                die ("Could not read tag %s", oid_to_hex(&tag->object.oid));
        message = memmem(buf, size, "\n\n", 2);
        if (!buf)
                die ("Could not read tag %s", oid_to_hex(&tag->object.oid));
        message = memmem(buf, size, "\n\n", 2);

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 0bc0dda99cd2ad74d5aa59831bac402264da0ae5..bd680be6874da29cf776c84468a60888beea53fb 100644 (file)
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -488,7 +488,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
                struct object_id *oid = origins.items[i].util;
                enum object_type type;
                unsigned long size, len;
                struct object_id *oid = origins.items[i].util;
                enum object_type type;
                unsigned long size, len;

-               char *buf = read_sha1_file(oid->hash, &type, &size);
+               char *buf = read_object_file(oid, &type, &size);

                struct strbuf sig = STRBUF_INIT;
 
                if (!buf || type != OBJ_TAG)
                struct strbuf sig = STRBUF_INIT;
 
                if (!buf || type != OBJ_TAG)

diff --git a/builtin/grep.c b/builtin/grep.c
index 386a86b66e93d06744e03831d14745841ef8e2b6..bf50bab6f8f1bcf20110af6036c1eb924b70f78b 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -306,7 +306,7 @@ static void *lock_and_read_oid_file(const struct object_id *oid, enum object_typ
        void *data;
 
        grep_read_lock();
        void *data;
 
        grep_read_lock();

-       data = read_sha1_file(oid->hash, type, size);
+       data = read_object_file(oid, type, size);

        grep_read_unlock();
        return data;
 }
        grep_read_unlock();
        return data;
 }

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 32a98f3102aab6ae9784fa26fa38c40c0623dde3..7873e7243ff1cd7bb705384d5579ae2c7334663a 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -815,7 +815,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
                        die(_("cannot read existing object info %s"), oid_to_hex(oid));
                if (has_type != type || has_size != size)
                        die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));
                        die(_("cannot read existing object info %s"), oid_to_hex(oid));
                if (has_type != type || has_size != size)
                        die(_("SHA1 COLLISION FOUND WITH %s !"), oid_to_hex(oid));

-               has_data = read_sha1_file(oid->hash, &has_type, &has_size);
+               has_data = read_object_file(oid, &has_type, &has_size);

                read_unlock();
                if (!data)
                        data = new_data = get_data_from_pack(obj_entry);
                read_unlock();
                if (!data)
                        data = new_data = get_data_from_pack(obj_entry);


@@ -1373,7 +1373,8 @@ static void fix_unresolved_deltas(struct hashfile *f)
 
                if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
                        continue;
 
                if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
                        continue;

-               base_obj->data = read_sha1_file(d->oid.hash, &type, &base_obj->size);
+               base_obj->data = read_object_file(&d->oid, &type,
+                                                 &base_obj->size);

                if (!base_obj->data)
                        continue;
 
                if (!base_obj->data)
                        continue;
 

diff --git a/builtin/log.c b/builtin/log.c
index 411339c1ed22a3fe00309c08b9a007da862051cb..71f68a3e4f59d987c653fb8f32a4d8770e9c6654 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -518,7 +518,7 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
 {
        unsigned long size;
        enum object_type type;
 {
        unsigned long size;
        enum object_type type;

-       char *buf = read_sha1_file(oid->hash, &type, &size);
+       char *buf = read_object_file(oid, &type, &size);

        int offset = 0;
 
        if (!buf)
        int offset = 0;
 
        if (!buf)

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index d01ddecf6602eabdca97a175e5c2a57bf1257865..32736e0b1011f575d2585fd2e012501d807f9e9b 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -60,7 +60,7 @@ static void *result(struct merge_list *entry, unsigned long *size)
        const char *path = entry->path;
 
        if (!entry->stage)
        const char *path = entry->path;
 
        if (!entry->stage)

-               return read_sha1_file(entry->blob->object.oid.hash, &type, size);
+               return read_object_file(&entry->blob->object.oid, &type, size);

        base = NULL;
        if (entry->stage == 1) {
                base = entry->blob;
        base = NULL;
        if (entry->stage == 1) {
                base = entry->blob;


@@ -82,7 +82,8 @@ static void *origin(struct merge_list *entry, unsigned long *size)
        enum object_type type;
        while (entry) {
                if (entry->stage == 2)
        enum object_type type;
        while (entry) {
                if (entry->stage == 2)

-                       return read_sha1_file(entry->blob->object.oid.hash, &type, size);
+                       return read_object_file(&entry->blob->object.oid,
+                                               &type, size);

                entry = entry->link;
        }
        return NULL;
                entry = entry->link;
        }
        return NULL;

diff --git a/builtin/mktag.c b/builtin/mktag.c
index 810b24bef38b434c59718a6ac2883b7cfaafcd21..cfb777b3c8efdc8aa28fd2cfe85e96cdfd0aa585 100644 (file)
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -23,7 +23,7 @@ static int verify_object(const struct object_id *oid, const char *expected_type)
        int ret = -1;
        enum object_type type;
        unsigned long size;
        int ret = -1;
        enum object_type type;
        unsigned long size;

-       void *buffer = read_sha1_file(oid->hash, &type, &size);
+       void *buffer = read_object_file(oid, &type, &size);

        const unsigned char *repl = lookup_replace_object(oid->hash);
 
        if (buffer) {
        const unsigned char *repl = lookup_replace_object(oid->hash);
 
        if (buffer) {

diff --git a/builtin/notes.c b/builtin/notes.c
index 08ab9d7130e2ab0998fb65caa9b9eebde8e66435..5ddfa44cde469afb196eb9be340f54d8d43e75f1 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -122,7 +122,7 @@ static void copy_obj_to_fd(int fd, const struct object_id *oid)
 {
        unsigned long size;
        enum object_type type;
 {
        unsigned long size;
        enum object_type type;

-       char *buf = read_sha1_file(oid->hash, &type, &size);
+       char *buf = read_object_file(oid, &type, &size);

        if (buf) {
                if (size)
                        write_or_die(fd, buf, size);
        if (buf) {
                if (size)
                        write_or_die(fd, buf, size);


@@ -253,7 +253,7 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
 
        if (get_oid(arg, &object))
                die(_("failed to resolve '%s' as a valid ref."), arg);
 
        if (get_oid(arg, &object))
                die(_("failed to resolve '%s' as a valid ref."), arg);

-       if (!(buf = read_sha1_file(object.hash, &type, &len))) {
+       if (!(buf = read_object_file(&object, &type, &len))) {

                free(buf);
                die(_("failed to read object '%s'."), arg);
        }
                free(buf);
                die(_("failed to read object '%s'."), arg);
        }


@@ -608,7 +608,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
                /* Append buf to previous note contents */
                unsigned long size;
                enum object_type type;
                /* Append buf to previous note contents */
                unsigned long size;
                enum object_type type;

-               char *prev_buf = read_sha1_file(note->hash, &type, &size);
+               char *prev_buf = read_object_file(note, &type, &size);

 
                strbuf_grow(&d.buf, size + 1);
                if (d.buf.len && prev_buf && size)
 
                strbuf_grow(&d.buf, size + 1);
                if (d.buf.len && prev_buf && size)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a0ccbf6699fdf594e48ab60ebe819efaf0983ffc..a1d674608a3477da14f4caf426b17aefe82d0dd9 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -122,11 +122,10 @@ static void *get_delta(struct object_entry *entry)
        void *buf, *base_buf, *delta_buf;
        enum object_type type;
 
        void *buf, *base_buf, *delta_buf;
        enum object_type type;
 

-       buf = read_sha1_file(entry->idx.oid.hash, &type, &size);
+       buf = read_object_file(&entry->idx.oid, &type, &size);

        if (!buf)
                die("unable to read %s", oid_to_hex(&entry->idx.oid));
        if (!buf)
                die("unable to read %s", oid_to_hex(&entry->idx.oid));

-       base_buf = read_sha1_file(entry->delta->idx.oid.hash, &type,
-                                 &base_size);
+       base_buf = read_object_file(&entry->delta->idx.oid, &type, &base_size);

        if (!base_buf)
                die("unable to read %s",
                    oid_to_hex(&entry->delta->idx.oid));
        if (!base_buf)
                die("unable to read %s",
                    oid_to_hex(&entry->delta->idx.oid));


@@ -270,8 +269,7 @@ static unsigned long write_no_reuse_object(struct hashfile *f, struct object_ent
                    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
                        buf = NULL;
                else {
                    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
                        buf = NULL;
                else {

-                       buf = read_sha1_file(entry->idx.oid.hash, &type,
-                                            &size);
+                       buf = read_object_file(&entry->idx.oid, &type, &size);

                        if (!buf)
                                die(_("unable to read %s"),
                                    oid_to_hex(&entry->idx.oid));
                        if (!buf)
                                die(_("unable to read %s"),
                                    oid_to_hex(&entry->idx.oid));


@@ -1190,7 +1188,7 @@ static struct pbase_tree_cache *pbase_tree_get(const struct object_id *oid)
        /* Did not find one.  Either we got a bogus request or
         * we need to read and perhaps cache.
         */
        /* Did not find one.  Either we got a bogus request or
         * we need to read and perhaps cache.
         */

-       data = read_sha1_file(oid->hash, &type, &size);
+       data = read_object_file(oid, &type, &size);

        if (!data)
                return NULL;
        if (type != OBJ_TREE) {
        if (!data)
                return NULL;
        if (type != OBJ_TREE) {


@@ -1870,8 +1868,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
        /* Load data if not already done */
        if (!trg->data) {
                read_lock();
        /* Load data if not already done */
        if (!trg->data) {
                read_lock();

-               trg->data = read_sha1_file(trg_entry->idx.oid.hash, &type,
-                                          &sz);
+               trg->data = read_object_file(&trg_entry->idx.oid, &type, &sz);

                read_unlock();
                if (!trg->data)
                        die("object %s cannot be read",
                read_unlock();
                if (!trg->data)
                        die("object %s cannot be read",


@@ -1884,8 +1881,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
        }
        if (!src->data) {
                read_lock();
        }
        if (!src->data) {
                read_lock();

-               src->data = read_sha1_file(src_entry->idx.oid.hash, &type,
-                                          &sz);
+               src->data = read_object_file(&src_entry->idx.oid, &type, &sz);

                read_unlock();
                if (!src->data) {
                        if (src_entry->preferred_base) {
                read_unlock();
                if (!src->data) {
                        if (src_entry->preferred_base) {

diff --git a/builtin/reflog.c b/builtin/reflog.c
index ac3dcd7a51170cd9146d044f6ab70203e6591507..25f7c5ef0b8887d5a1b5003e7a6d02da081aa7c9 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -74,7 +74,7 @@ static int tree_is_complete(const struct object_id *oid)
        if (!tree->buffer) {
                enum object_type type;
                unsigned long size;
        if (!tree->buffer) {
                enum object_type type;
                unsigned long size;

-               void *data = read_sha1_file(oid->hash, &type, &size);
+               void *data = read_object_file(oid, &type, &size);

                if (!data) {
                        tree->object.flags |= INCOMPLETE;
                        return 0;
                if (!data) {
                        tree->object.flags |= INCOMPLETE;
                        return 0;

diff --git a/builtin/tag.c b/builtin/tag.c
index 11a9883d272053464e9617c195981db21da6772e..86450bae0506b7ec75bd168566067010df0cb0a0 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -168,7 +168,7 @@ static void write_tag_body(int fd, const struct object_id *oid)
        enum object_type type;
        char *buf, *sp;
 
        enum object_type type;
        char *buf, *sp;
 

-       buf = read_sha1_file(oid->hash, &type, &size);
+       buf = read_object_file(oid, &type, &size);

        if (!buf)
                return;
        /* skip header */
        if (!buf)
                return;
        /* skip header */


@@ -304,7 +304,7 @@ static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb)
                strbuf_addstr(sb, "object of unknown type");
                break;
        case OBJ_COMMIT:
                strbuf_addstr(sb, "object of unknown type");
                break;
        case OBJ_COMMIT:

-               if ((buf = read_sha1_file(oid->hash, &type, &size)) != NULL) {
+               if ((buf = read_object_file(oid, &type, &size)) != NULL) {

                        subject_len = find_commit_subject(buf, &subject_start);
                        strbuf_insert(sb, sb->len, subject_start, subject_len);
                } else {
                        subject_len = find_commit_subject(buf, &subject_start);
                        strbuf_insert(sb, sb->len, subject_start, subject_len);
                } else {

diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index 32e01555774c838e489fd33c675488e754c3e8e2..300eb59657e29cace38798029a9170834cac7c9e 100644 (file)
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c
@@ -9,7 +9,7 @@ static char *create_temp_file(struct object_id *oid)
        unsigned long size;
        int fd;
 
        unsigned long size;
        int fd;
 

-       buf = read_sha1_file(oid->hash, &type, &size);
+       buf = read_object_file(oid, &type, &size);

        if (!buf || type != OBJ_BLOB)
                die("unable to read blob object %s", oid_to_hex(oid));
 
        if (!buf || type != OBJ_BLOB)
                die("unable to read blob object %s", oid_to_hex(oid));
 

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 6d553374c08cd98ca37ea2f53e3a9311e8192e04..af02e1bc6b3062a1863e798cd9812bbe9dac50bc 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -422,7 +422,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
        if (resolve_against_held(nr, &base_oid, delta_data, delta_size))
                return;
 
        if (resolve_against_held(nr, &base_oid, delta_data, delta_size))
                return;
 

-       base = read_sha1_file(base_oid.hash, &type, &base_size);
+       base = read_object_file(&base_oid, &type, &base_size);

        if (!base) {
                error("failed to read delta-pack base object %s",
                      oid_to_hex(&base_oid));
        if (!base) {
                error("failed to read delta-pack base object %s",
                      oid_to_hex(&base_oid));

diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c
index 05315ea7c966d3ed5b91e4cbd77eaa9943af253d..dcdaada111071c84b56022d9050ae06ffafbc25f 100644 (file)
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@ -44,7 +44,7 @@ static int verify_commit(const char *name, unsigned flags)
        if (get_oid(name, &oid))
                return error("commit '%s' not found.", name);
 
        if (get_oid(name, &oid))
                return error("commit '%s' not found.", name);
 

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

        if (!buf)
                return error("%s: unable to read file.", name);
        if (type != OBJ_COMMIT)
        if (!buf)
                return error("%s: unable to read file.", name);
        if (type != OBJ_COMMIT)

diff --git a/bundle.c b/bundle.c
index efe547e25fe2a53bd0ef7954cf3bec6d55218365..902c9b54485be2000696a697472fa10d97b36153 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -222,7 +222,7 @@ static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
        if (revs->max_age == -1 && revs->min_age == -1)
                goto out;
 
        if (revs->max_age == -1 && revs->min_age == -1)
                goto out;
 

-       buf = read_sha1_file(tag->oid.hash, &type, &size);
+       buf = read_object_file(&tag->oid, &type, &size);

        if (!buf)
                goto out;
        line = memmem(buf, size, "\ntagger ", 8);
        if (!buf)
                goto out;
        line = memmem(buf, size, "\ntagger ", 8);

diff --git a/cache.h b/cache.h
index 9293c145649cee50b540725f80df24c5e49edcea..3c9718cc8c92dffc7febfdbab7286d1c6a73959d 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1185,12 +1185,12 @@ extern char *xdg_config_home(const char *filename);
  */
 extern char *xdg_cache_home(const char *filename);
 
  */
 extern char *xdg_cache_home(const char *filename);
 

-extern void *read_sha1_file_extended(const unsigned char *sha1,
-                                    enum object_type *type,
-                                    unsigned long *size, int lookup_replace);
-static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
+extern void *read_object_file_extended(const struct object_id *oid,
+                                      enum object_type *type,
+                                      unsigned long *size, int lookup_replace);
+static inline void *read_object_file(const struct object_id *oid, enum object_type *type, unsigned long *size)

 {
 {

-       return read_sha1_file_extended(sha1, type, size, 1);
+       return read_object_file_extended(oid, type, size, 1);

 }
 
 /*
 }
 
 /*

diff --git a/combine-diff.c b/combine-diff.c
index cf55f03b75e43adf8c0200fca816adafa4b796ff..2ef495963fc1cf2e092778d35f1965912d7eaac0 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -306,7 +306,7 @@ static char *grab_blob(const struct object_id *oid, unsigned int mode,
                *size = fill_textconv(textconv, df, &blob);
                free_filespec(df);
        } else {
                *size = fill_textconv(textconv, df, &blob);
                free_filespec(df);
        } else {

-               blob = read_sha1_file(oid->hash, &type, size);
+               blob = read_object_file(oid, &type, size);

                if (type != OBJ_BLOB)
                        die("object '%s' is not a blob!", oid_to_hex(oid));
        }
                if (type != OBJ_BLOB)
                        die("object '%s' is not a blob!", oid_to_hex(oid));
        }

diff --git a/commit.c b/commit.c
index 6d77787af98cfa1011553d19ebda94d29cb4fca7..ca474a7c112855a49b77cce7cdfb83937fa17fae 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -266,7 +266,7 @@ const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
        if (!ret) {
                enum object_type type;
                unsigned long size;
        if (!ret) {
                enum object_type type;
                unsigned long size;

-               ret = read_sha1_file(commit->object.oid.hash, &type, &size);
+               ret = read_object_file(&commit->object.oid, &type, &size);

                if (!ret)
                        die("cannot read commit object %s",
                            oid_to_hex(&commit->object.oid));
                if (!ret)
                        die("cannot read commit object %s",
                            oid_to_hex(&commit->object.oid));


@@ -383,7 +383,7 @@ int parse_commit_gently(struct commit *item, int quiet_on_missing)
                return -1;
        if (item->object.parsed)
                return 0;
                return -1;
        if (item->object.parsed)
                return 0;

-       buffer = read_sha1_file(item->object.oid.hash, &type, &size);
+       buffer = read_object_file(&item->object.oid, &type, &size);

        if (!buffer)
                return quiet_on_missing ? -1 :
                        error("Could not read %s",
        if (!buffer)
                return quiet_on_missing ? -1 :
                        error("Could not read %s",


@@ -1206,7 +1206,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
        desc = merge_remote_util(parent);
        if (!desc || !desc->obj)
                return;
        desc = merge_remote_util(parent);
        if (!desc || !desc->obj)
                return;

-       buf = read_sha1_file(desc->obj->oid.hash, &type, &size);
+       buf = read_object_file(&desc->obj->oid, &type, &size);

        if (!buf || type != OBJ_TAG)
                goto free_return;
        len = parse_signature(buf, size);
        if (!buf || type != OBJ_TAG)
                goto free_return;
        len = parse_signature(buf, size);

diff --git a/config.c b/config.c
index b0c20e6cb8ab1f5dc3cd3b4573b7e9d6dbf8cd2b..c698988f5e11cd416bef9a77c998d94b9ef87930 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1488,7 +1488,7 @@ int git_config_from_blob_oid(config_fn_t fn,
        unsigned long size;
        int ret;
 
        unsigned long size;
        int ret;
 

-       buf = read_sha1_file(oid->hash, &type, &size);
+       buf = read_object_file(oid, &type, &size);

        if (!buf)
                return error("unable to load config blob object '%s'", name);
        if (type != OBJ_BLOB) {
        if (!buf)
                return error("unable to load config blob object '%s'", name);
        if (type != OBJ_BLOB) {

diff --git a/diff.c b/diff.c
index b463078d570356477b08f94f75c9a8a821737f84..5c8f3e16e8f2d75f583af426c01bbcd08dd9a14c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3626,7 +3626,7 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
                                return 0;
                        }
                }
                                return 0;
                        }
                }

-               s->data = read_sha1_file(s->oid.hash, &type, &s->size);
+               s->data = read_object_file(&s->oid, &type, &s->size);

                if (!s->data)
                        die("unable to read %s", oid_to_hex(&s->oid));
                s->should_free = 1;
                if (!s->data)
                        die("unable to read %s", oid_to_hex(&s->oid));
                s->should_free = 1;

diff --git a/dir.c b/dir.c
index dedbf5d476f207e39c1b7853ec8c97553181e5fb..63a917be45db99c278cc86012ff74718043dc63d 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -243,7 +243,7 @@ static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat,
        *size_out = 0;
        *data_out = NULL;
 
        *size_out = 0;
        *data_out = NULL;
 

-       data = read_sha1_file(oid->hash, &type, &sz);
+       data = read_object_file(oid, &type, &sz);

        if (!data || type != OBJ_BLOB) {
                free(data);
                return -1;
        if (!data || type != OBJ_BLOB) {
                free(data);
                return -1;

diff --git a/entry.c b/entry.c
index 6c33112aea7dc8e584678bcb5e5ea292d29265a9..d3f26ec8ca2ed3777941ec1f83952afbdb40d898 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -85,7 +85,7 @@ static int create_file(const char *path, unsigned int mode)
 static void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
 {
        enum object_type type;
 static void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
 {
        enum object_type type;

-       void *blob_data = read_sha1_file(ce->oid.hash, &type, size);
+       void *blob_data = read_object_file(&ce->oid, &type, size);

 
        if (blob_data) {
                if (type == OBJ_BLOB)
 
        if (blob_data) {
                if (type == OBJ_BLOB)

diff --git a/fast-import.c b/fast-import.c
index dc63af1eb69f7ed8aba21f478174db475d4d88bf..b300e4416de38cf7f2bed96da988e7de861f0a09 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1412,7 +1412,7 @@ static void load_tree(struct tree_entry *root)
                        die("Can't load tree %s", oid_to_hex(oid));
        } else {
                enum object_type type;
                        die("Can't load tree %s", oid_to_hex(oid));
        } else {
                enum object_type type;

-               buf = read_sha1_file(oid->hash, &type, &size);
+               buf = read_object_file(oid, &type, &size);

                if (!buf || type != OBJ_TREE)
                        die("Can't load tree %s", oid_to_hex(oid));
        }
                if (!buf || type != OBJ_TREE)
                        die("Can't load tree %s", oid_to_hex(oid));
        }


@@ -2967,7 +2967,7 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
        char *buf;
 
        if (!oe || oe->pack_id == MAX_PACK_ID) {
        char *buf;
 
        if (!oe || oe->pack_id == MAX_PACK_ID) {

-               buf = read_sha1_file(oid->hash, &type, &size);
+               buf = read_object_file(oid, &type, &size);

        } else {
                type = oe->type;
                buf = gfi_unpack_entry(oe, &size);
        } else {
                type = oe->type;
                buf = gfi_unpack_entry(oe, &size);


@@ -3072,7 +3072,7 @@ static struct object_entry *dereference(struct object_entry *oe,
                buf = gfi_unpack_entry(oe, &size);
        } else {
                enum object_type unused;
                buf = gfi_unpack_entry(oe, &size);
        } else {
                enum object_type unused;

-               buf = read_sha1_file(oid->hash, &unused, &size);
+               buf = read_object_file(oid, &unused, &size);

        }
        if (!buf)
                die("Can't load object %s", oid_to_hex(oid));
        }
        if (!buf)
                die("Can't load object %s", oid_to_hex(oid));

diff --git a/fsck.c b/fsck.c
index 5c8c12dde381912eccf59bbf3ed8c774344809b8..9218c2a643b83e68b9f59479bcc1be833ae8be96 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -811,7 +811,7 @@ static int fsck_tag_buffer(struct tag *tag, const char *data,
                enum object_type type;
 
                buffer = to_free =
                enum object_type type;
 
                buffer = to_free =

-                       read_sha1_file(tag->object.oid.hash, &type, &size);
+                       read_object_file(&tag->object.oid, &type, &size);

                if (!buffer)
                        return report(options, &tag->object,
                                FSCK_MSG_MISSING_TAG_OBJECT,
                if (!buffer)
                        return report(options, &tag->object,
                                FSCK_MSG_MISSING_TAG_OBJECT,

diff --git a/grep.c b/grep.c
index 834b8eb439297ff5af4a3da8b946a40ca68057f1..65b90c10a38c136d2ce9a42fee5c543cd7d4717d 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -2015,7 +2015,7 @@ static int grep_source_load_oid(struct grep_source *gs)
        enum object_type type;
 
        grep_read_lock();
        enum object_type type;
 
        grep_read_lock();

-       gs->buf = read_sha1_file(gs->identifier, &type, &gs->size);
+       gs->buf = read_object_file(gs->identifier, &type, &gs->size);

        grep_read_unlock();
 
        if (!gs->buf)
        grep_read_unlock();
 
        if (!gs->buf)

diff --git a/http-push.c b/http-push.c
index 7dcd9daf62cf07e1cc43022fde17607cef6dc147..ff82b63133fe4b3de046e15f1066ce6df27404ac 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -361,7 +361,7 @@ static void start_put(struct transfer_request *request)
        ssize_t size;
        git_zstream stream;
 
        ssize_t size;
        git_zstream stream;
 

-       unpacked = read_sha1_file(request->obj->oid.hash, &type, &len);
+       unpacked = read_object_file(&request->obj->oid, &type, &len);

        hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(type), len) + 1;
 
        /* Set it up */
        hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(type), len) + 1;
 
        /* Set it up */

diff --git a/mailmap.c b/mailmap.c
index cb921b4db676e3db918ee16f419cd2b78e0bf57e..13f0d2884e25edef3fde5bdf72b89a770111e472 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -224,7 +224,7 @@ static int read_mailmap_blob(struct string_list *map,
        if (get_oid(name, &oid) < 0)
                return 0;
 
        if (get_oid(name, &oid) < 0)
                return 0;
 

-       buf = read_sha1_file(oid.hash, &type, &size);
+       buf = read_object_file(&oid, &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)

diff --git a/match-trees.c b/match-trees.c
index 10d6c39d47b4d59a5f6c73dc448c86638a531287..72cc2baa3f96b2cbfa296335c7f0ff1094b6e96c 100644 (file)
--- a/match-trees.c
+++ b/match-trees.c
@@ -54,7 +54,7 @@ static void *fill_tree_desc_strict(struct tree_desc *desc,
        enum object_type type;
        unsigned long size;
 
        enum object_type type;
        unsigned long size;
 

-       buffer = read_sha1_file(hash->hash, &type, &size);
+       buffer = read_object_file(hash, &type, &size);

        if (!buffer)
                die("unable to read tree (%s)", oid_to_hex(hash));
        if (type != OBJ_TREE)
        if (!buffer)
                die("unable to read tree (%s)", oid_to_hex(hash));
        if (type != OBJ_TREE)


@@ -180,7 +180,7 @@ static int splice_tree(const struct object_id *oid1, const char *prefix,
        if (*subpath)
                subpath++;
 
        if (*subpath)
                subpath++;
 

-       buf = read_sha1_file(oid1->hash, &type, &sz);
+       buf = read_object_file(oid1, &type, &sz);

        if (!buf)
                die("cannot read tree %s", oid_to_hex(oid1));
        init_tree_desc(&desc, buf, sz);
        if (!buf)
                die("cannot read tree %s", oid_to_hex(oid1));
        init_tree_desc(&desc, buf, sz);

diff --git a/merge-blobs.c b/merge-blobs.c
index 9b6eac22e4256d8f2bf82961b6e4f320d89fdeba..fa49c17287f4120b4bbb75acc6b92b3d339710cd 100644 (file)
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -11,7 +11,7 @@ static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
        unsigned long size;
        enum object_type type;
 
        unsigned long size;
        enum object_type type;
 

-       buf = read_sha1_file(obj->object.oid.hash, &type, &size);
+       buf = read_object_file(&obj->object.oid, &type, &size);

        if (!buf)
                return -1;
        if (type != OBJ_BLOB) {
        if (!buf)
                return -1;
        if (type != OBJ_BLOB) {


@@ -66,7 +66,7 @@ void *merge_blobs(const char *path, struct blob *base, struct blob *our, struct
                        return NULL;
                if (!our)
                        our = their;
                        return NULL;
                if (!our)
                        our = their;

-               return read_sha1_file(our->object.oid.hash, &type, size);
+               return read_object_file(&our->object.oid, &type, size);

        }
 
        if (fill_mmfile_blob(&f1, our) < 0)
        }
 
        if (fill_mmfile_blob(&f1, our) < 0)

diff --git a/merge-recursive.c b/merge-recursive.c
index 85f8cbee99f9ab517d5eed99bca7fa6b3ed20946..c55401698dbab0a3fffd1b38371b4e8bc02795fe 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -842,7 +842,7 @@ static int update_file_flags(struct merge_options *o,
                        goto update_index;
                }
 
                        goto update_index;
                }
 

-               buf = read_sha1_file(oid->hash, &type, &size);
+               buf = read_object_file(oid, &type, &size);

                if (!buf)
                        return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
                if (type != OBJ_BLOB) {
                if (!buf)
                        return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
                if (type != OBJ_BLOB) {


@@ -1656,7 +1656,7 @@ static int read_oid_strbuf(struct merge_options *o,
        void *buf;
        enum object_type type;
        unsigned long size;
        void *buf;
        enum object_type type;
        unsigned long size;

-       buf = read_sha1_file(oid->hash, &type, &size);
+       buf = read_object_file(oid, &type, &size);

        if (!buf)
                return err(o, _("cannot read object %s"), oid_to_hex(oid));
        if (type != OBJ_BLOB) {
        if (!buf)
                return err(o, _("cannot read object %s"), oid_to_hex(oid));
        if (type != OBJ_BLOB) {

diff --git a/notes-cache.c b/notes-cache.c
index 398e61d5e943b1e6e143f159739f83fc0df9b6b8..e61988e503b0b2097afeb6716123d88429c0717d 100644 (file)
--- a/notes-cache.c
+++ b/notes-cache.c
@@ -77,7 +77,7 @@ char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid,
        value_oid = get_note(&c->tree, key_oid);
        if (!value_oid)
                return NULL;
        value_oid = get_note(&c->tree, key_oid);
        if (!value_oid)
                return NULL;

-       value = read_sha1_file(value_oid->hash, &type, &size);
+       value = read_object_file(value_oid, &type, &size);

 
        *outsize = size;
        return value;
 
        *outsize = size;
        return value;

diff --git a/notes-merge.c b/notes-merge.c
index c09c5e0e474a30b0a8bf3d91063c8bbc61e63557..8e0726a9418e3b24bc8e665057f607e18e7d4206 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -322,7 +322,7 @@ static void write_note_to_worktree(const struct object_id *obj,
 {
        enum object_type type;
        unsigned long size;
 {
        enum object_type type;
        unsigned long size;

-       void *buf = read_sha1_file(note->hash, &type, &size);
+       void *buf = read_object_file(note, &type, &size);

 
        if (!buf)
                die("cannot read note %s for object %s",
 
        if (!buf)
                die("cannot read note %s for object %s",

diff --git a/notes.c b/notes.c
index d25121a65d4aefb1ae3c9e1f7c12308168c63c72..a386d450c4c812ef30d0fc661fe2c03e1d062a83 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -796,13 +796,13 @@ int combine_notes_concatenate(struct object_id *cur_oid,
 
        /* read in both note blob objects */
        if (!is_null_oid(new_oid))
 
        /* read in both note blob objects */
        if (!is_null_oid(new_oid))

-               new_msg = read_sha1_file(new_oid->hash, &new_type, &new_len);
+               new_msg = read_object_file(new_oid, &new_type, &new_len);

        if (!new_msg || !new_len || new_type != OBJ_BLOB) {
                free(new_msg);
                return 0;
        }
        if (!is_null_oid(cur_oid))
        if (!new_msg || !new_len || new_type != OBJ_BLOB) {
                free(new_msg);
                return 0;
        }
        if (!is_null_oid(cur_oid))

-               cur_msg = read_sha1_file(cur_oid->hash, &cur_type, &cur_len);
+               cur_msg = read_object_file(cur_oid, &cur_type, &cur_len);

        if (!cur_msg || !cur_len || cur_type != OBJ_BLOB) {
                free(cur_msg);
                free(new_msg);
        if (!cur_msg || !cur_len || cur_type != OBJ_BLOB) {
                free(cur_msg);
                free(new_msg);


@@ -858,7 +858,7 @@ static int string_list_add_note_lines(struct string_list *list,
                return 0;
 
        /* read_sha1_file NUL-terminates */
                return 0;
 
        /* read_sha1_file NUL-terminates */

-       data = read_sha1_file(oid->hash, &t, &len);
+       data = read_object_file(oid, &t, &len);

        if (t != OBJ_BLOB || !data || !len) {
                free(data);
                return t != OBJ_BLOB || !data;
        if (t != OBJ_BLOB || !data || !len) {
                free(data);
                return t != OBJ_BLOB || !data;


@@ -1217,7 +1217,7 @@ static void format_note(struct notes_tree *t, const struct object_id *object_oid
        if (!oid)
                return;
 
        if (!oid)
                return;
 

-       if (!(msg = read_sha1_file(oid->hash, &type, &msglen)) || type != OBJ_BLOB) {
+       if (!(msg = read_object_file(oid, &type, &msglen)) || type != OBJ_BLOB) {

                free(msg);
                return;
        }
                free(msg);
                return;
        }

diff --git a/object.c b/object.c
index 4063e955dba1c32de6bd878324df858be3b0f164..8e32f0d33b2a3ab35cb0a2d3148482b7d33417cb 100644 (file)
--- a/object.c
+++ b/object.c
@@ -266,7 +266,7 @@ struct object *parse_object(const struct object_id *oid)
                return lookup_object(oid->hash);
        }
 
                return lookup_object(oid->hash);
        }
 

-       buffer = read_sha1_file(oid->hash, &type, &size);
+       buffer = read_object_file(oid, &type, &size);

        if (buffer) {
                struct object_id reploid;
                hashcpy(reploid.hash, repl);
        if (buffer) {
                struct object_id reploid;
                hashcpy(reploid.hash, repl);

diff --git a/read-cache.c b/read-cache.c
index 977921d90c65ea94b40cb7f8332246bf77c0f215..3f0246fe8822fb7584826a5de449b6a6055d47cc 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -184,7 +184,7 @@ static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
        if (strbuf_readlink(&sb, ce->name, expected_size))
                return -1;
 
        if (strbuf_readlink(&sb, ce->name, expected_size))
                return -1;
 

-       buffer = read_sha1_file(ce->oid.hash, &type, &size);
+       buffer = read_object_file(&ce->oid, &type, &size);

        if (buffer) {
                if (size == sb.len)
                        match = memcmp(buffer, sb.buf, size);
        if (buffer) {
                if (size == sb.len)
                        match = memcmp(buffer, sb.buf, size);


@@ -2683,7 +2683,7 @@ void *read_blob_data_from_index(const struct index_state *istate,
        }
        if (pos < 0)
                return NULL;
        }
        if (pos < 0)
                return NULL;

-       data = read_sha1_file(istate->cache[pos]->oid.hash, &type, &sz);
+       data = read_object_file(&istate->cache[pos]->oid, &type, &sz);

        if (!data || type != OBJ_BLOB) {
                free(data);
                return NULL;
        if (!data || type != OBJ_BLOB) {
                free(data);
                return NULL;

diff --git a/ref-filter.c b/ref-filter.c
index ca2bc7e6b21a34aa684a8deae21c0d46b17f09bf..9a333e21b51a0583415e23f905876291dd2ef349 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -728,7 +728,7 @@ int verify_ref_format(struct ref_format *format)
 static void *get_obj(const struct object_id *oid, struct object **obj, unsigned long *sz, int *eaten)
 {
        enum object_type type;
 static void *get_obj(const struct object_id *oid, struct object **obj, unsigned long *sz, int *eaten)
 {
        enum object_type type;

-       void *buf = read_sha1_file(oid->hash, &type, sz);
+       void *buf = read_object_file(oid, &type, sz);

 
        if (buf)
                *obj = parse_object_buffer(oid, type, *sz, buf, eaten);
 
        if (buf)
                *obj = parse_object_buffer(oid, type, *sz, buf, eaten);

diff --git a/remote-testsvn.c b/remote-testsvn.c
index bcebb4c789567eb4017a3a0132ba55c59c427991..c4bb9a8ba920c1b344b910e7f6e59915044f4f9a 100644 (file)
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -61,7 +61,7 @@ static char *read_ref_note(const struct object_id *oid)
        init_notes(NULL, notes_ref, NULL, 0);
        if (!(note_oid = get_note(NULL, oid)))
                return NULL;    /* note tree not found */
        init_notes(NULL, notes_ref, NULL, 0);
        if (!(note_oid = get_note(NULL, oid)))
                return NULL;    /* note tree not found */

-       if (!(msg = read_sha1_file(note_oid->hash, &type, &msglen)))
+       if (!(msg = read_object_file(note_oid, &type, &msglen)))

                error("Empty notes tree. %s", notes_ref);
        else if (!msglen || type != OBJ_BLOB) {
                error("Note contains unusable content. "
                error("Empty notes tree. %s", notes_ref);
        else if (!msglen || type != OBJ_BLOB) {
                error("Note contains unusable content. "


@@ -108,7 +108,7 @@ static int note2mark_cb(const struct object_id *object_oid,
        enum object_type type;
        struct rev_note note;
 
        enum object_type type;
        struct rev_note note;
 

-       if (!(msg = read_sha1_file(note_oid->hash, &type, &msglen)) ||
+       if (!(msg = read_object_file(note_oid, &type, &msglen)) ||

                        !msglen || type != OBJ_BLOB) {
                free(msg);
                return 1;
                        !msglen || type != OBJ_BLOB) {
                free(msg);
                return 1;

diff --git a/rerere.c b/rerere.c
index 79203c6c1eae0db5515030b138e9e40e219af5f5..8af6b660e0dc71b0c82db1ff21c58babffaf8800 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -981,8 +981,8 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
                        break;
                i = ce_stage(ce) - 1;
                if (!mmfile[i].ptr) {
                        break;
                i = ce_stage(ce) - 1;
                if (!mmfile[i].ptr) {

-                       mmfile[i].ptr = read_sha1_file(ce->oid.hash, &type,
-                                                      &size);
+                       mmfile[i].ptr = read_object_file(&ce->oid, &type,
+                                                        &size);

                        mmfile[i].size = size;
                }
        }
                        mmfile[i].size = size;
                }
        }

diff --git a/sha1_file.c b/sha1_file.c
index e2b8e7694eddac01c7299cbe626746edfa35e22f..cdd49e5274158a3caf7e426b66fa5302378e9f96 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1363,17 +1363,17 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type,
  * deal with them should arrange to call read_object() and give error
  * messages themselves.
  */
  * deal with them should arrange to call read_object() and give error
  * messages themselves.
  */

-void *read_sha1_file_extended(const unsigned char *sha1,
-                             enum object_type *type,
-                             unsigned long *size,
-                             int lookup_replace)
+void *read_object_file_extended(const struct object_id *oid,
+                               enum object_type *type,
+                               unsigned long *size,
+                               int lookup_replace)

 {
        void *data;
        const struct packed_git *p;
        const char *path;
        struct stat st;
 {
        void *data;
        const struct packed_git *p;
        const char *path;
        struct stat st;

-       const unsigned char *repl = lookup_replace ? lookup_replace_object(sha1)
-                                                  : sha1;
+       const unsigned char *repl = lookup_replace ? lookup_replace_object(oid->hash)
+                                                  : oid->hash;

 
        errno = 0;
        data = read_object(repl, type, size);
 
        errno = 0;
        data = read_object(repl, type, size);


@@ -1381,12 +1381,12 @@ void *read_sha1_file_extended(const unsigned char *sha1,
                return data;
 
        if (errno && errno != ENOENT)
                return data;
 
        if (errno && errno != ENOENT)

-               die_errno("failed to read object %s", sha1_to_hex(sha1));
+               die_errno("failed to read object %s", oid_to_hex(oid));

 
        /* die if we replaced an object with one that does not exist */
 
        /* die if we replaced an object with one that does not exist */

-       if (repl != sha1)
+       if (repl != oid->hash)

                die("replacement %s not found for %s",
                die("replacement %s not found for %s",

-                   sha1_to_hex(repl), sha1_to_hex(sha1));
+                   sha1_to_hex(repl), oid_to_hex(oid));

 
        if (!stat_sha1_file(repl, &st, &path))
                die("loose object %s (stored in %s) is corrupt",
 
        if (!stat_sha1_file(repl, &st, &path))
                die("loose object %s (stored in %s) is corrupt",


@@ -1415,7 +1415,7 @@ void *read_object_with_reference(const struct object_id *oid,
                int ref_length = -1;
                const char *ref_type = NULL;
 
                int ref_length = -1;
                const char *ref_type = NULL;
 

-               buffer = read_sha1_file(actual_oid.hash, &type, &isize);
+               buffer = read_object_file(&actual_oid, &type, &isize);

                if (!buffer)
                        return NULL;
                if (type == required_type) {
                if (!buffer)
                        return NULL;
                if (type == required_type) {

diff --git a/streaming.c b/streaming.c
index 3f4be1ea2c3e9ed68190b8e2bb54c9b3de6d853b..72a3ca8d08d7a67cf03a9e278225f52a70301f5b 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -492,7 +492,7 @@ static struct stream_vtbl incore_vtbl = {
 
 static open_method_decl(incore)
 {
 
 static open_method_decl(incore)
 {

-       st->u.incore.buf = read_sha1_file_extended(oid->hash, type, &st->size, 0);
+       st->u.incore.buf = read_object_file_extended(oid, type, &st->size, 0);

        st->u.incore.read_ptr = 0;
        st->vtbl = &incore_vtbl;
 
        st->u.incore.read_ptr = 0;
        st->vtbl = &incore_vtbl;
 

diff --git a/submodule-config.c b/submodule-config.c
index 602ba8ca8b8455df9b34e2990397c838d542569f..3f2075764feb53fc8c981aab39d16c6b191cb6d8 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -520,7 +520,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
        if (submodule)
                goto out;
 
        if (submodule)
                goto out;
 

-       config = read_sha1_file(oid.hash, &type, &config_size);
+       config = read_object_file(&oid, &type, &config_size);

        if (!config || type != OBJ_BLOB)
                goto out;
 
        if (!config || type != OBJ_BLOB)
                goto out;
 

diff --git a/tag.c b/tag.c
index db3e31034ca49a35a0919db08429510f636f2586..86b1dcbb8270e944ac643a39835d490bbaf35b20 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -49,7 +49,7 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
                                find_unique_abbrev(oid, DEFAULT_ABBREV),
                                type_name(type));
 
                                find_unique_abbrev(oid, DEFAULT_ABBREV),
                                type_name(type));
 

-       buf = read_sha1_file(oid->hash, &type, &size);
+       buf = read_object_file(oid, &type, &size);

        if (!buf)
                return error("%s: unable to read file.",
                                name_to_report ?
        if (!buf)
                return error("%s: unable to read file.",
                                name_to_report ?


@@ -182,7 +182,7 @@ int parse_tag(struct tag *item)
 
        if (item->object.parsed)
                return 0;
 
        if (item->object.parsed)
                return 0;

-       data = read_sha1_file(item->object.oid.hash, &type, &size);
+       data = read_object_file(&item->object.oid, &type, &size);

        if (!data)
                return error("Could not read %s",
                             oid_to_hex(&item->object.oid));
        if (!data)
                return error("Could not read %s",
                             oid_to_hex(&item->object.oid));

diff --git a/tree-walk.c b/tree-walk.c
index b7e504070caf75bc7fb41c23717dabc3fe424431..e11b3063afa610239162dc45c24528dd144c4759 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -713,8 +713,8 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
                         */
                        retval = DANGLING_SYMLINK;
 
                         */
                        retval = DANGLING_SYMLINK;
 

-                       contents = read_sha1_file(current_tree_oid.hash, &type,
-                                                 &link_len);
+                       contents = read_object_file(&current_tree_oid, &type,
+                                                   &link_len);

 
                        if (!contents)
                                goto done;
 
                        if (!contents)
                                goto done;

diff --git a/tree.c b/tree.c
index 1a0f03f5207a4cd85da5540edc5be593ff37e829..1c68ea586bd30d3e3389efa1c83f25ed607d1d80 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -219,7 +219,7 @@ int parse_tree_gently(struct tree *item, int quiet_on_missing)
 
        if (item->object.parsed)
                return 0;
 
        if (item->object.parsed)
                return 0;

-       buffer = read_sha1_file(item->object.oid.hash, &type, &size);
+       buffer = read_object_file(&item->object.oid, &type, &size);

        if (!buffer)
                return quiet_on_missing ? -1 :
                        error("Could not read %s",
        if (!buffer)
                return quiet_on_missing ? -1 :
                        error("Could not read %s",

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 770e1f7f8185e05f2618c261b70a5773041432fb..9315bc0ede11ba0377e27d711e37b6a0ae555c43 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -191,7 +191,7 @@ void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
                return;
        }
 
                return;
        }
 

-       ptr->ptr = read_sha1_file(oid->hash, &type, &size);
+       ptr->ptr = read_object_file(oid, &type, &size);

        if (!ptr->ptr || type != OBJ_BLOB)
                die("unable to read blob object %s", oid_to_hex(oid));
        ptr->size = size;
        if (!ptr->ptr || type != OBJ_BLOB)
                die("unable to read blob object %s", oid_to_hex(oid));
        ptr->size = size;