sha1_file: convert sha1_object_info* to object_id

Convert sha1_object_info and sha1_object_info_extended to take pointers
to struct object_id and rename them to use "oid" instead of "sha1" in
their names.  Update the declaration and definition and apply the
following semantic patch, plus the standard object_id transforms:

@@
expression E1, E2;
@@
- sha1_object_info(E1.hash, E2)
+ oid_object_info(&E1, E2)

@@
expression E1, E2;
@@
- sha1_object_info(E1->hash, E2)
+ oid_object_info(E1, E2)

@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1.hash, E2, E3)
+ oid_object_info_extended(&E1, E2, E3)

@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1->hash, E2, E3)
+ oid_object_info_extended(E1, E2, E3)

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive-tar.c b/archive-tar.c
index 7a0d31d847904e1314769302af3bd61c4c330e3e..3563bcb9f263f7782a77c679bf9be32af6bd13df 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -276,7 +276,7 @@ static int write_tar_entry(struct archiver_args *args,
                memcpy(header.name, path, pathlen);
 
        if (S_ISREG(mode) && !args->convert &&
                memcpy(header.name, path, pathlen);
 
        if (S_ISREG(mode) && !args->convert &&

-           sha1_object_info(oid->hash, &size) == OBJ_BLOB &&
+           oid_object_info(oid, &size) == OBJ_BLOB &&

            size > big_file_threshold)
                buffer = NULL;
        else if (S_ISLNK(mode) || S_ISREG(mode)) {
            size > big_file_threshold)
                buffer = NULL;
        else if (S_ISLNK(mode) || S_ISREG(mode)) {

diff --git a/archive-zip.c b/archive-zip.c
index 18b951b732ef4921b2913e8d614a5c00225e8d2c..6b20bce4d1cd78563037c8658dd8bd8f7690c47b 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -325,7 +325,7 @@ static int write_zip_entry(struct archiver_args *args,
                compressed_size = 0;
                buffer = NULL;
        } else if (S_ISREG(mode) || S_ISLNK(mode)) {
                compressed_size = 0;
                buffer = NULL;
        } else if (S_ISREG(mode) || S_ISLNK(mode)) {

-               enum object_type type = sha1_object_info(oid->hash, &size);
+               enum object_type type = oid_object_info(oid, &size);

 
                method = 0;
                attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
 
                method = 0;
                attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :

diff --git a/blame.c b/blame.c
index 200e0ad9a299adb13982cdc27cb6e9a768560f58..00b97c18986091c50140dd644c9dc2405162c600 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -81,7 +81,7 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path)
                unsigned mode;
 
                if (!get_tree_entry(commit_oid->hash, path, blob_oid.hash, &mode) &&
                unsigned mode;
 
                if (!get_tree_entry(commit_oid->hash, path, blob_oid.hash, &mode) &&

-                   sha1_object_info(blob_oid.hash, NULL) == OBJ_BLOB)
+                   oid_object_info(&blob_oid, NULL) == OBJ_BLOB)

                        return;
        }
 
                        return;
        }
 


@@ -506,7 +506,7 @@ static int fill_blob_sha1_and_mode(struct blame_origin *origin)
                           origin->path,
                           origin->blob_oid.hash, &origin->mode))
                goto error_out;
                           origin->path,
                           origin->blob_oid.hash, &origin->mode))
                goto error_out;

-       if (sha1_object_info(origin->blob_oid.hash, NULL) != OBJ_BLOB)
+       if (oid_object_info(&origin->blob_oid, NULL) != OBJ_BLOB)

                goto error_out;
        return 0;
  error_out:
                goto error_out;
        return 0;
  error_out:

diff --git a/builtin/blame.c b/builtin/blame.c
index b980e8a1ddb5056dccf6d51cc33fc42026e3a517..f1a2fd67029e6980d317da5136aece233ba192f1 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -655,7 +655,7 @@ static int is_a_rev(const char *name)
 
        if (get_oid(name, &oid))
                return 0;
 
        if (get_oid(name, &oid))
                return 0;

-       return OBJ_NONE < sha1_object_info(oid.hash, NULL);
+       return OBJ_NONE < oid_object_info(&oid, NULL);

 }
 
 int cmd_blame(int argc, const char **argv, const char *prefix)
 }
 
 int cmd_blame(int argc, const char **argv, const char *prefix)

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index d90170f070f4f6ab7750c31fdcfac462c934b26d..27f4f235f6da176adf3e452f9f4fefd14bb453eb 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -77,7 +77,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
        switch (opt) {
        case 't':
                oi.type_name = &sb;
        switch (opt) {
        case 't':
                oi.type_name = &sb;

-               if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
+               if (oid_object_info_extended(&oid, &oi, flags) < 0)

                        die("git cat-file: could not get object info");
                if (sb.len) {
                        printf("%s\n", sb.buf);
                        die("git cat-file: could not get object info");
                if (sb.len) {
                        printf("%s\n", sb.buf);


@@ -88,7 +88,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 
        case 's':
                oi.sizep = &size;
 
        case 's':
                oi.sizep = &size;

-               if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
+               if (oid_object_info_extended(&oid, &oi, flags) < 0)

                        die("git cat-file: could not get object info");
                printf("%lu\n", size);
                return 0;
                        die("git cat-file: could not get object info");
                printf("%lu\n", size);
                return 0;


@@ -116,7 +116,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
                /* else fallthrough */
 
        case 'p':
                /* else fallthrough */
 
        case 'p':

-               type = sha1_object_info(oid.hash, NULL);
+               type = oid_object_info(&oid, NULL);

                if (type < 0)
                        die("Not a valid object name %s", obj_name);
 
                if (type < 0)
                        die("Not a valid object name %s", obj_name);
 


@@ -140,7 +140,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
        case 0:
                if (type_from_string(exp_type) == OBJ_BLOB) {
                        struct object_id blob_oid;
        case 0:
                if (type_from_string(exp_type) == OBJ_BLOB) {
                        struct object_id blob_oid;

-                       if (sha1_object_info(oid.hash, NULL) == OBJ_TAG) {
+                       if (oid_object_info(&oid, NULL) == OBJ_TAG) {

                                char *buffer = read_sha1_file(oid.hash, &type, &size);
                                const char *target;
                                if (!skip_prefix(buffer, "object ", &target) ||
                                char *buffer = read_sha1_file(oid.hash, &type, &size);
                                const char *target;
                                if (!skip_prefix(buffer, "object ", &target) ||


@@ -150,7 +150,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
                        } else
                                oidcpy(&blob_oid, &oid);
 
                        } else
                                oidcpy(&blob_oid, &oid);
 

-                       if (sha1_object_info(blob_oid.hash, NULL) == OBJ_BLOB)
+                       if (oid_object_info(&blob_oid, NULL) == OBJ_BLOB)

                                return stream_blob_to_fd(1, &blob_oid, NULL, 0);
                        /*
                         * we attempted to dereference a tag to a blob
                                return stream_blob_to_fd(1, &blob_oid, NULL, 0);
                        /*
                         * we attempted to dereference a tag to a blob


@@ -340,8 +340,8 @@ static void batch_object_write(const char *obj_name, struct batch_options *opt,
        struct strbuf buf = STRBUF_INIT;
 
        if (!data->skip_object_info &&
        struct strbuf buf = STRBUF_INIT;
 
        if (!data->skip_object_info &&

-           sha1_object_info_extended(data->oid.hash, &data->info,
-                                     OBJECT_INFO_LOOKUP_REPLACE) < 0) {
+           oid_object_info_extended(&data->oid, &data->info,
+                                    OBJECT_INFO_LOOKUP_REPLACE) < 0) {

                printf("%s missing\n",
                       obj_name ? obj_name : oid_to_hex(&data->oid));
                fflush(stdout);
                printf("%s missing\n",
                       obj_name ? obj_name : oid_to_hex(&data->oid));
                fflush(stdout);

diff --git a/builtin/describe.c b/builtin/describe.c
index 7e6535a8bd372ef1f560ea8ecf5f957740cd5e42..de840f96a4ba0135667261cfd74c674672f4c6b4 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -502,7 +502,7 @@ static void describe(const char *arg, int last_one)
 
        if (cmit)
                describe_commit(&oid, &sb);
 
        if (cmit)
                describe_commit(&oid, &sb);

-       else if (sha1_object_info(oid.hash, NULL) == OBJ_BLOB)
+       else if (oid_object_info(&oid, NULL) == OBJ_BLOB)

                describe_blob(oid, &sb);
        else
                die(_("%s is neither a commit nor blob"), arg);
                describe_blob(oid, &sb);
        else
                die(_("%s is neither a commit nor blob"), arg);

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 9b049e9d081d16da0601f7e1bc112f6c3aad7a07..d75a3a45d3d5dbd41f9a94c040700e6678e8cf9c 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -947,7 +947,7 @@ static void import_marks(char *input_file)
                if (last_idnum < mark)
                        last_idnum = mark;
 
                if (last_idnum < mark)
                        last_idnum = mark;
 

-               type = sha1_object_info(oid.hash, NULL);
+               type = oid_object_info(&oid, NULL);

                if (type < 0)
                        die("object not found: %s", oid_to_hex(&oid));
 
                if (type < 0)
                        die("object not found: %s", oid_to_hex(&oid));
 

diff --git a/builtin/fetch.c b/builtin/fetch.c
index aeafe63ba6e4b09eb5d7e61387f1bfb04ee67e47..90bb659390e6df7fb51e153de662761ebe33a414 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -637,7 +637,7 @@ static int update_local_ref(struct ref *ref,
        struct branch *current_branch = branch_get(NULL);
        const char *pretty_ref = prettify_refname(ref->name);
 
        struct branch *current_branch = branch_get(NULL);
        const char *pretty_ref = prettify_refname(ref->name);
 

-       type = sha1_object_info(ref->new_oid.hash, NULL);
+       type = oid_object_info(&ref->new_oid, NULL);

        if (type < 0)
                die(_("object %s not found"), oid_to_hex(&ref->new_oid));
 
        if (type < 0)
                die(_("object %s not found"), oid_to_hex(&ref->new_oid));
 

diff --git a/builtin/fsck.c b/builtin/fsck.c
index eae018e3fb06c1a9c1bd472fc077869aafbc5693..09225586835eb872ea0152018f1f85dc23f63710 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -65,7 +65,7 @@ static const char *printable_type(struct object *obj)
        const char *ret;
 
        if (obj->type == OBJ_NONE) {
        const char *ret;
 
        if (obj->type == OBJ_NONE) {

-               enum object_type type = sha1_object_info(obj->oid.hash, NULL);
+               enum object_type type = oid_object_info(&obj->oid, NULL);

                if (type > 0)
                        object_as_type(obj, type, 0);
        }
                if (type > 0)
                        object_as_type(obj, type, 0);
        }

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index ae11d2a610fdbcf14146c2311c1cf6292a0cfa0b..32a98f3102aab6ae9784fa26fa38c40c0623dde3 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -221,7 +221,7 @@ static unsigned check_object(struct object *obj)
 
        if (!(obj->flags & FLAG_CHECKED)) {
                unsigned long size;
 
        if (!(obj->flags & FLAG_CHECKED)) {
                unsigned long size;

-               int type = sha1_object_info(obj->oid.hash, &size);
+               int type = oid_object_info(&obj->oid, &size);

                if (type <= 0)
                        die(_("did not receive expected object %s"),
                              oid_to_hex(&obj->oid));
                if (type <= 0)
                        die(_("did not receive expected object %s"),
                              oid_to_hex(&obj->oid));


@@ -810,7 +810,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
                enum object_type has_type;
                unsigned long has_size;
                read_lock();
                enum object_type has_type;
                unsigned long has_size;
                read_lock();

-               has_type = sha1_object_info(oid->hash, &has_size);
+               has_type = oid_object_info(oid, &has_size);

                if (has_type < 0)
                        die(_("cannot read existing object info %s"), oid_to_hex(oid));
                if (has_type != type || has_size != size)
                if (has_type < 0)
                        die(_("cannot read existing object info %s"), oid_to_hex(oid));
                if (has_type != type || has_size != size)

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index c98253adbb41737d0ec7c632c17ec5c0efd098ca..d44b4f9c27d31cfa331ccef7ae538d8a6e6c38c6 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -94,7 +94,7 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
                        char size_text[24];
                        if (!strcmp(type, blob_type)) {
                                unsigned long size;
                        char size_text[24];
                        if (!strcmp(type, blob_type)) {
                                unsigned long size;

-                               if (sha1_object_info(oid->hash, &size) == OBJ_BAD)
+                               if (oid_object_info(oid, &size) == OBJ_BAD)

                                        xsnprintf(size_text, sizeof(size_text),
                                                  "BAD");
                                else
                                        xsnprintf(size_text, sizeof(size_text),
                                                  "BAD");
                                else

diff --git a/builtin/mktree.c b/builtin/mktree.c
index e39fe5d4239f34f273370d66ba5b19f1c6d53d11..263c530315a4fe435a88f2042c768350f72e837b 100644 (file)
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -116,7 +116,7 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss
        }
 
        /* Check the type of object identified by sha1 */
        }
 
        /* Check the type of object identified by sha1 */

-       obj_type = sha1_object_info(oid.hash, NULL);
+       obj_type = oid_object_info(&oid, NULL);

        if (obj_type < 0) {
                if (allow_missing) {
                        ; /* no problem - missing objects are presumed to be of the right type */
        if (obj_type < 0) {
                if (allow_missing) {
                        ; /* no problem - missing objects are presumed to be of the right type */

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 8307cc9b04f39686d86a799b820f17b2650417fa..66bc0057fe697fd7db15009f389a28a0ee319d62 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1516,7 +1516,7 @@ static void check_object(struct object_entry *entry)
                unuse_pack(&w_curs);
        }
 
                unuse_pack(&w_curs);
        }
 

-       entry->type = sha1_object_info(entry->idx.oid.hash, &entry->size);
+       entry->type = oid_object_info(&entry->idx.oid, &entry->size);

        /*
         * The error condition is checked in prepare_pack().  This is
         * to permit a missing preferred base object to be ignored
        /*
         * The error condition is checked in prepare_pack().  This is
         * to permit a missing preferred base object to be ignored


@@ -1578,8 +1578,7 @@ static void drop_reused_delta(struct object_entry *entry)
                 * And if that fails, the error will be recorded in entry->type
                 * and dealt with in prepare_pack().
                 */
                 * And if that fails, the error will be recorded in entry->type
                 * and dealt with in prepare_pack().
                 */

-               entry->type = sha1_object_info(entry->idx.oid.hash,
-                                              &entry->size);
+               entry->type = oid_object_info(&entry->idx.oid, &entry->size);

        }
 }
 
        }
 }
 


@@ -2708,7 +2707,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs)
 static int add_loose_object(const struct object_id *oid, const char *path,
                            void *data)
 {
 static int add_loose_object(const struct object_id *oid, const char *path,
                            void *data)
 {

-       enum object_type type = sha1_object_info(oid->hash, NULL);
+       enum object_type type = oid_object_info(oid, NULL);

 
        if (type < 0) {
                warning("loose object at %s could not be examined", path);
 
        if (type < 0) {
                warning("loose object at %s could not be examined", path);

diff --git a/builtin/prune.c b/builtin/prune.c
index 4394d01c9350ae3e1fa26de034edf1509128469e..38ced18dadff03836c6bed3fcbdefe8bd528a7c0 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -50,7 +50,7 @@ static int prune_object(const struct object_id *oid, const char *fullpath,
        if (st.st_mtime > expire)
                return 0;
        if (show_only || verbose) {
        if (st.st_mtime > expire)
                return 0;
        if (show_only || verbose) {

-               enum object_type type = sha1_object_info(oid->hash, NULL);
+               enum object_type type = oid_object_info(oid, NULL);

                printf("%s %s\n", oid_to_hex(oid),
                       (type > 0) ? type_name(type) : "unknown");
        }
                printf("%s %s\n", oid_to_hex(oid),
                       (type > 0) ? type_name(type) : "unknown");
        }

diff --git a/builtin/replace.c b/builtin/replace.c
index 9f01f3fc7f86ef6e13933524441f330d3dae1573..19006e52bc644eca598aec76c5ccda6cbdc8c334 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -53,8 +53,8 @@ static int show_reference(const char *refname, const struct object_id *oid,
                        if (get_oid(refname, &object))
                                return error("Failed to resolve '%s' as a valid ref.", refname);
 
                        if (get_oid(refname, &object))
                                return error("Failed to resolve '%s' as a valid ref.", refname);
 

-                       obj_type = sha1_object_info(object.hash, NULL);
-                       repl_type = sha1_object_info(oid->hash, NULL);
+                       obj_type = oid_object_info(&object, NULL);
+                       repl_type = oid_object_info(oid, NULL);

 
                        printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type),
                               oid_to_hex(oid), type_name(repl_type));
 
                        printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type),
                               oid_to_hex(oid), type_name(repl_type));


@@ -162,8 +162,8 @@ static int replace_object_oid(const char *object_ref,
        struct ref_transaction *transaction;
        struct strbuf err = STRBUF_INIT;
 
        struct ref_transaction *transaction;
        struct strbuf err = STRBUF_INIT;
 

-       obj_type = sha1_object_info(object->hash, NULL);
-       repl_type = sha1_object_info(repl->hash, NULL);
+       obj_type = oid_object_info(object, NULL);
+       repl_type = oid_object_info(repl, NULL);

        if (!force && obj_type != repl_type)
                die("Objects must be of the same type.\n"
                    "'%s' points to a replaced object of type '%s'\n"
        if (!force && obj_type != repl_type)
                die("Objects must be of the same type.\n"
                    "'%s' points to a replaced object of type '%s'\n"


@@ -290,7 +290,7 @@ static int edit_and_replace(const char *object_ref, int force, int raw)
        if (get_oid(object_ref, &old_oid) < 0)
                die("Not a valid object name: '%s'", object_ref);
 
        if (get_oid(object_ref, &old_oid) < 0)
                die("Not a valid object name: '%s'", object_ref);
 

-       type = sha1_object_info(old_oid.hash, NULL);
+       type = oid_object_info(&old_oid, NULL);

        if (type < 0)
                die("unable to get object type for %s", oid_to_hex(&old_oid));
 
        if (type < 0)
                die("unable to get object type for %s", oid_to_hex(&old_oid));
 

diff --git a/builtin/tag.c b/builtin/tag.c
index 644e6888be2ef609f26acaadcefa5c5e8226b5fe..11a9883d272053464e9617c195981db21da6772e 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -212,7 +212,7 @@ static void create_tag(const struct object_id *object, const char *tag,
        struct strbuf header = STRBUF_INIT;
        char *path = NULL;
 
        struct strbuf header = STRBUF_INIT;
        char *path = NULL;
 

-       type = sha1_object_info(object->hash, NULL);
+       type = oid_object_info(object, NULL);

        if (type <= OBJ_NONE)
            die(_("bad object type."));
 
        if (type <= OBJ_NONE)
            die(_("bad object type."));
 


@@ -298,7 +298,7 @@ static void create_reflog_msg(const struct object_id *oid, struct strbuf *sb)
        }
 
        strbuf_addstr(sb, " (");
        }
 
        strbuf_addstr(sb, " (");

-       type = sha1_object_info(oid->hash, NULL);
+       type = oid_object_info(oid, NULL);

        switch (type) {
        default:
                strbuf_addstr(sb, "object of unknown type");
        switch (type) {
        default:
                strbuf_addstr(sb, "object of unknown type");

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 9f96949bc02be374382283cf1f35ac9ec946da2f..6d553374c08cd98ca37ea2f53e3a9311e8192e04 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -198,7 +198,7 @@ static int check_object(struct object *obj, int type, void *data, struct fsck_op
 
        if (!(obj->flags & FLAG_OPEN)) {
                unsigned long size;
 
        if (!(obj->flags & FLAG_OPEN)) {
                unsigned long size;

-               int type = sha1_object_info(obj->oid.hash, &size);
+               int type = oid_object_info(&obj->oid, &size);

                if (type != obj->type || type <= 0)
                        die("object of unexpected type");
                obj->flags |= FLAG_WRITTEN;
                if (type != obj->type || type <= 0)
                        die("object of unexpected type");
                obj->flags |= FLAG_WRITTEN;

diff --git a/cache.h b/cache.h
index 67a04fcd122ffb55e061a41376d85fd0d7cd835b..66f41af56e0bc3f075d128f876664c64ab61b740 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1212,8 +1212,8 @@ static inline const unsigned char *lookup_replace_object(const unsigned char *sh
        return do_lookup_replace_object(sha1);
 }
 
        return do_lookup_replace_object(sha1);
 }
 

-/* Read and unpack a sha1 file into memory, write memory to a sha1 file */
-extern int sha1_object_info(const unsigned char *, unsigned long *);
+/* Read and unpack an object file into memory, write memory to an object file */
+extern int oid_object_info(const struct object_id *, unsigned long *);

 
 extern int hash_object_file(const void *buf, unsigned long len,
                            const char *type, struct object_id *oid);
 
 extern int hash_object_file(const void *buf, unsigned long len,
                            const char *type, struct object_id *oid);


@@ -1773,7 +1773,7 @@ struct object_info {
 #define OBJECT_INFO_SKIP_CACHED 4
 /* Do not retry packed storage after checking packed and loose storage */
 #define OBJECT_INFO_QUICK 8
 #define OBJECT_INFO_SKIP_CACHED 4
 /* Do not retry packed storage after checking packed and loose storage */
 #define OBJECT_INFO_QUICK 8

-extern int sha1_object_info_extended(const unsigned char *, struct object_info *, unsigned flags);
+extern int oid_object_info_extended(const struct object_id *, struct object_info *, unsigned flags);

 
 /*
  * Set this to 0 to prevent sha1_object_info_extended() from fetching missing
 
 /*
  * Set this to 0 to prevent sha1_object_info_extended() from fetching missing

diff --git a/diff.c b/diff.c
index 8184ecfc2abdbf76006894d3cb2c3b21279c9576..b463078d570356477b08f94f75c9a8a821737f84 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3615,7 +3615,7 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
        else {
                enum object_type type;
                if (size_only || (flags & CHECK_BINARY)) {
        else {
                enum object_type type;
                if (size_only || (flags & CHECK_BINARY)) {

-                       type = sha1_object_info(s->oid.hash, &s->size);
+                       type = oid_object_info(&s->oid, &s->size);

                        if (type < 0)
                                die("unable to read %s",
                                    oid_to_hex(&s->oid));
                        if (type < 0)
                                die("unable to read %s",
                                    oid_to_hex(&s->oid));

diff --git a/fast-import.c b/fast-import.c
index 58ef360da43d3d7d55733cb8ee66014351814921..af3a211ec33f53f4187ec0e92e8f5b3f16d81ea7 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1913,7 +1913,7 @@ static void read_marks(void)
                        die("corrupt mark line: %s", line);
                e = find_object(&oid);
                if (!e) {
                        die("corrupt mark line: %s", line);
                e = find_object(&oid);
                if (!e) {

-                       enum object_type type = sha1_object_info(oid.hash, NULL);
+                       enum object_type type = oid_object_info(&oid, NULL);

                        if (type < 0)
                                die("object not found: %s", oid_to_hex(&oid));
                        e = insert_object(&oid);
                        if (type < 0)
                                die("object not found: %s", oid_to_hex(&oid));
                        e = insert_object(&oid);


@@ -2443,7 +2443,7 @@ static void file_change_m(const char *p, struct branch *b)
                enum object_type expected = S_ISDIR(mode) ?
                                                OBJ_TREE: OBJ_BLOB;
                enum object_type type = oe ? oe->type :
                enum object_type expected = S_ISDIR(mode) ?
                                                OBJ_TREE: OBJ_BLOB;
                enum object_type type = oe ? oe->type :

-                                       sha1_object_info(oid.hash, NULL);
+                                       oid_object_info(&oid, NULL);

                if (type < 0)
                        die("%s not found: %s",
                                        S_ISDIR(mode) ?  "Tree" : "Blob",
                if (type < 0)
                        die("%s not found: %s",
                                        S_ISDIR(mode) ?  "Tree" : "Blob",


@@ -2603,7 +2603,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
                        die("Not a blob (actually a %s): %s",
                                type_name(oe->type), command_buf.buf);
        } else if (!is_null_oid(&oid)) {
                        die("Not a blob (actually a %s): %s",
                                type_name(oe->type), command_buf.buf);
        } else if (!is_null_oid(&oid)) {

-               enum object_type type = sha1_object_info(oid.hash, NULL);
+               enum object_type type = oid_object_info(&oid, NULL);

                if (type < 0)
                        die("Blob not found: %s", command_buf.buf);
                if (type != OBJ_BLOB)
                if (type < 0)
                        die("Blob not found: %s", command_buf.buf);
                if (type != OBJ_BLOB)


@@ -2890,7 +2890,7 @@ static void parse_new_tag(const char *arg)
        } else if (!get_oid(from, &oid)) {
                struct object_entry *oe = find_object(&oid);
                if (!oe) {
        } else if (!get_oid(from, &oid)) {
                struct object_entry *oe = find_object(&oid);
                if (!oe) {

-                       type = sha1_object_info(oid.hash, NULL);
+                       type = oid_object_info(&oid, NULL);

                        if (type < 0)
                                die("Not a valid object: %s", from);
                } else
                        if (type < 0)
                                die("Not a valid object: %s", from);
                } else


@@ -3048,7 +3048,7 @@ static struct object_entry *dereference(struct object_entry *oe,
        unsigned long size;
        char *buf = NULL;
        if (!oe) {
        unsigned long size;
        char *buf = NULL;
        if (!oe) {

-               enum object_type type = sha1_object_info(oid->hash, NULL);
+               enum object_type type = oid_object_info(oid, NULL);

                if (type < 0)
                        die("object not found: %s", oid_to_hex(oid));
                /* cache it! */
                if (type < 0)
                        die("object not found: %s", oid_to_hex(oid));
                /* cache it! */

diff --git a/list-objects-filter.c b/list-objects-filter.c
index 4356c45368e10bd7f41e15f91130dbfd3e4e9281..0ec83aaf1888903be4f1de38c8a94a594ef2130a 100644 (file)
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -117,7 +117,7 @@ static enum list_objects_filter_result filter_blobs_limit(
                assert(obj->type == OBJ_BLOB);
                assert((obj->flags & SEEN) == 0);
 
                assert(obj->type == OBJ_BLOB);
                assert((obj->flags & SEEN) == 0);
 

-               t = sha1_object_info(obj->oid.hash, &object_length);
+               t = oid_object_info(&obj->oid, &object_length);

                if (t != OBJ_BLOB) { /* probably OBJ_NONE */
                        /*
                         * We DO NOT have the blob locally, so we cannot
                if (t != OBJ_BLOB) { /* probably OBJ_NONE */
                        /*
                         * We DO NOT have the blob locally, so we cannot

diff --git a/object.c b/object.c
index 68bcf35d955a03f87ffe956de08fb3f7c30791a1..4063e955dba1c32de6bd878324df858be3b0f164 100644 (file)
--- a/object.c
+++ b/object.c
@@ -254,7 +254,7 @@ struct object *parse_object(const struct object_id *oid)
 
        if ((obj && obj->type == OBJ_BLOB && has_object_file(oid)) ||
            (!obj && has_object_file(oid) &&
 
        if ((obj && obj->type == OBJ_BLOB && has_object_file(oid)) ||
            (!obj && has_object_file(oid) &&

-            sha1_object_info(oid->hash, NULL) == OBJ_BLOB)) {
+            oid_object_info(oid, NULL) == OBJ_BLOB)) {

                struct object_id reploid;
                hashcpy(reploid.hash, repl);
 
                struct object_id reploid;
                hashcpy(reploid.hash, repl);
 

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index e01f9928840488b85db2ebc62527d8e4aab81ffc..41ae27fb19a94a4c44058d8850a9592c41b82f90 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -73,8 +73,7 @@ void bitmap_writer_build_type_index(struct pack_idx_entry **index,
                        break;
 
                default:
                        break;
 
                default:

-                       real_type = sha1_object_info(entry->idx.oid.hash,
-                                                    NULL);
+                       real_type = oid_object_info(&entry->idx.oid, NULL);

                        break;
                }
 
                        break;
                }
 

diff --git a/packfile.c b/packfile.c
index 3e31ad7a0c9be11ffc76c7ccb0840399b345d88f..f26395ecabb39470f0ddfd127a417439a09de432 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1101,7 +1101,7 @@ static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
                return OBJ_BAD;
        nth_packed_object_oid(&oid, p, revidx->nr);
        mark_bad_packed_object(p, oid.hash);
                return OBJ_BAD;
        nth_packed_object_oid(&oid, p, revidx->nr);
        mark_bad_packed_object(p, oid.hash);

-       type = sha1_object_info(oid.hash, NULL);
+       type = oid_object_info(&oid, NULL);

        if (type <= OBJ_NONE)
                return OBJ_BAD;
        return type;
        if (type <= OBJ_NONE)
                return OBJ_BAD;
        return type;


@@ -1461,7 +1461,7 @@ static void *read_object(const struct object_id *oid, enum object_type *type,
        oi.sizep = size;
        oi.contentp = &content;
 
        oi.sizep = size;
        oi.contentp = &content;
 

-       if (sha1_object_info_extended(oid->hash, &oi, 0) < 0)
+       if (oid_object_info_extended(oid, &oi, 0) < 0)

                return NULL;
        return content;
 }
                return NULL;
        return content;
 }

diff --git a/reachable.c b/reachable.c
index 191ebe3e6a99d26913a510967a9545f53db58bc8..404e1440e96b23abb3e4919fdda110e89fff7626 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -77,7 +77,7 @@ static void add_recent_object(const struct object_id *oid,
         * later processing, and the revision machinery expects
         * commits and tags to have been parsed.
         */
         * later processing, and the revision machinery expects
         * commits and tags to have been parsed.
         */

-       type = sha1_object_info(oid->hash, NULL);
+       type = oid_object_info(oid, NULL);

        if (type < 0)
                die("unable to get object info for %s", oid_to_hex(oid));
 
        if (type < 0)
                die("unable to get object info for %s", oid_to_hex(oid));
 

diff --git a/refs.c b/refs.c
index 20ba82b4343ff2ef72cea32deec8a8d7fbd6def7..8b7a77fe5eedb08c0b034b1cf3bb4ef40efa9834 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -301,7 +301,7 @@ enum peel_status peel_object(const struct object_id *name, struct object_id *oid
        struct object *o = lookup_unknown_object(name->hash);
 
        if (o->type == OBJ_NONE) {
        struct object *o = lookup_unknown_object(name->hash);
 
        if (o->type == OBJ_NONE) {

-               int type = sha1_object_info(name->hash, NULL);
+               int type = oid_object_info(name, NULL);

                if (type < 0 || !object_as_type(o, type, 0))
                        return PEEL_INVALID;
        }
                if (type < 0 || !object_as_type(o, type, 0))
                        return PEEL_INVALID;
        }

diff --git a/remote.c b/remote.c
index c10d87c24615e9d6497b46a69a82a71d3c1735a6..91eb010ca983c5493bbc17c5652ef31060390226 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1376,7 +1376,7 @@ static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***ds
                        continue; /* not a tag */
                if (string_list_has_string(&dst_tag, ref->name))
                        continue; /* they already have it */
                        continue; /* not a tag */
                if (string_list_has_string(&dst_tag, ref->name))
                        continue; /* they already have it */

-               if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
+               if (oid_object_info(&ref->new_oid, NULL) != OBJ_TAG)

                        continue; /* be conservative */
                item = string_list_append(&src_tag, ref->name);
                item->util = ref;
                        continue; /* be conservative */
                item = string_list_append(&src_tag, ref->name);
                item->util = ref;

diff --git a/sequencer.c b/sequencer.c
index c994392caf63b77407306e7bece845d2c52f8ac3..47b050edfbba053cc5fac3266994c3f68fb5735d 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -2881,7 +2881,8 @@ int sequencer_pick_revisions(struct replay_opts *opts)
 
                if (!get_oid(name, &oid)) {
                        if (!lookup_commit_reference_gently(&oid, 1)) {
 
                if (!get_oid(name, &oid)) {
                        if (!lookup_commit_reference_gently(&oid, 1)) {

-                               enum object_type type = sha1_object_info(oid.hash, NULL);
+                               enum object_type type = oid_object_info(&oid,
+                                                                       NULL);

                                return error(_("%s: can't cherry-pick a %s"),
                                        name, type_name(type));
                        }
                                return error(_("%s: can't cherry-pick a %s"),
                                        name, type_name(type));
                        }

diff --git a/sha1_file.c b/sha1_file.c
index eafb0733e51cb60cc58bc5d63859132650fccc4c..e1292c11fd55eb58fc8db805e9c71f6362bc8348 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1222,14 +1222,14 @@ static int sha1_loose_object_info(const unsigned char *sha1,
 
 int fetch_if_missing = 1;
 
 
 int fetch_if_missing = 1;
 

-int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, unsigned flags)
+int oid_object_info_extended(const struct object_id *oid, struct object_info *oi, unsigned flags)

 {
        static struct object_info blank_oi = OBJECT_INFO_INIT;
        struct pack_entry e;
        int rtype;
        const unsigned char *real = (flags & OBJECT_INFO_LOOKUP_REPLACE) ?
 {
        static struct object_info blank_oi = OBJECT_INFO_INIT;
        struct pack_entry e;
        int rtype;
        const unsigned char *real = (flags & OBJECT_INFO_LOOKUP_REPLACE) ?

-                                   lookup_replace_object(sha1) :
-                                   sha1;
+                                   lookup_replace_object(oid->hash) :
+                                   oid->hash;

        int already_retried = 0;
        struct object_id realoid;
 
        int already_retried = 0;
        struct object_id realoid;
 


@@ -1298,7 +1298,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
        rtype = packed_object_info(e.p, e.offset, oi);
        if (rtype < 0) {
                mark_bad_packed_object(e.p, real);
        rtype = packed_object_info(e.p, e.offset, oi);
        if (rtype < 0) {
                mark_bad_packed_object(e.p, real);

-               return sha1_object_info_extended(realoid.hash, oi, 0);
+               return oid_object_info_extended(&realoid, oi, 0);

        } else if (oi->whence == OI_PACKED) {
                oi->u.packed.offset = e.offset;
                oi->u.packed.pack = e.p;
        } else if (oi->whence == OI_PACKED) {
                oi->u.packed.offset = e.offset;
                oi->u.packed.pack = e.p;


@@ -1310,15 +1310,15 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 }
 
 /* returns enum object_type or negative */
 }
 
 /* returns enum object_type or negative */

-int sha1_object_info(const unsigned char *sha1, unsigned long *sizep)
+int oid_object_info(const struct object_id *oid, unsigned long *sizep)

 {
        enum object_type type;
        struct object_info oi = OBJECT_INFO_INIT;
 
        oi.typep = &type;
        oi.sizep = sizep;
 {
        enum object_type type;
        struct object_info oi = OBJECT_INFO_INIT;
 
        oi.typep = &type;
        oi.sizep = sizep;

-       if (sha1_object_info_extended(sha1, &oi,
-                                     OBJECT_INFO_LOOKUP_REPLACE) < 0)
+       if (oid_object_info_extended(oid, &oi,
+                                    OBJECT_INFO_LOOKUP_REPLACE) < 0)

                return -1;
        return type;
 }
                return -1;
        return type;
 }


@@ -1335,7 +1335,7 @@ static void *read_object(const unsigned char *sha1, enum object_type *type,
 
        hashcpy(oid.hash, sha1);
 
 
        hashcpy(oid.hash, sha1);
 

-       if (sha1_object_info_extended(oid.hash, &oi, 0) < 0)
+       if (oid_object_info_extended(&oid, &oi, 0) < 0)

                return NULL;
        return content;
 }
                return NULL;
        return content;
 }


@@ -1733,8 +1733,8 @@ int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
        if (!startup_info->have_repository)
                return 0;
        hashcpy(oid.hash, sha1);
        if (!startup_info->have_repository)
                return 0;
        hashcpy(oid.hash, sha1);

-       return sha1_object_info_extended(oid.hash, NULL,
-                                        flags | OBJECT_INFO_SKIP_CACHED) >= 0;
+       return oid_object_info_extended(&oid, NULL,
+                                       flags | OBJECT_INFO_SKIP_CACHED) >= 0;

 }
 
 int has_object_file(const struct object_id *oid)
 }
 
 int has_object_file(const struct object_id *oid)


@@ -1976,7 +1976,7 @@ int read_pack_header(int fd, struct pack_header *header)
 
 void assert_oid_type(const struct object_id *oid, enum object_type expect)
 {
 
 void assert_oid_type(const struct object_id *oid, enum object_type expect)
 {

-       enum object_type type = sha1_object_info(oid->hash, NULL);
+       enum object_type type = oid_object_info(oid, NULL);

        if (type < 0)
                die("%s is not a valid object", oid_to_hex(oid));
        if (type != expect)
        if (type < 0)
                die("%s is not a valid object", oid_to_hex(oid));
        if (type != expect)

diff --git a/sha1_name.c b/sha1_name.c
index b59f3ed7488f7455fc11d72d570d08eb8269c4f4..d129dc4f31015c0144df4b70523589bf12637831 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -238,7 +238,7 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
 
 static int disambiguate_commit_only(const struct object_id *oid, void *cb_data_unused)
 {
 
 static int disambiguate_commit_only(const struct object_id *oid, void *cb_data_unused)
 {

-       int kind = sha1_object_info(oid->hash, NULL);
+       int kind = oid_object_info(oid, NULL);

        return kind == OBJ_COMMIT;
 }
 
        return kind == OBJ_COMMIT;
 }
 


@@ -247,7 +247,7 @@ static int disambiguate_committish_only(const struct object_id *oid, void *cb_da
        struct object *obj;
        int kind;
 
        struct object *obj;
        int kind;
 

-       kind = sha1_object_info(oid->hash, NULL);
+       kind = oid_object_info(oid, NULL);

        if (kind == OBJ_COMMIT)
                return 1;
        if (kind != OBJ_TAG)
        if (kind == OBJ_COMMIT)
                return 1;
        if (kind != OBJ_TAG)


@@ -262,7 +262,7 @@ static int disambiguate_committish_only(const struct object_id *oid, void *cb_da
 
 static int disambiguate_tree_only(const struct object_id *oid, void *cb_data_unused)
 {
 
 static int disambiguate_tree_only(const struct object_id *oid, void *cb_data_unused)
 {

-       int kind = sha1_object_info(oid->hash, NULL);
+       int kind = oid_object_info(oid, NULL);

        return kind == OBJ_TREE;
 }
 
        return kind == OBJ_TREE;
 }
 


@@ -271,7 +271,7 @@ static int disambiguate_treeish_only(const struct object_id *oid, void *cb_data_
        struct object *obj;
        int kind;
 
        struct object *obj;
        int kind;
 

-       kind = sha1_object_info(oid->hash, NULL);
+       kind = oid_object_info(oid, NULL);

        if (kind == OBJ_TREE || kind == OBJ_COMMIT)
                return 1;
        if (kind != OBJ_TAG)
        if (kind == OBJ_TREE || kind == OBJ_COMMIT)
                return 1;
        if (kind != OBJ_TAG)


@@ -286,7 +286,7 @@ static int disambiguate_treeish_only(const struct object_id *oid, void *cb_data_
 
 static int disambiguate_blob_only(const struct object_id *oid, void *cb_data_unused)
 {
 
 static int disambiguate_blob_only(const struct object_id *oid, void *cb_data_unused)
 {

-       int kind = sha1_object_info(oid->hash, NULL);
+       int kind = oid_object_info(oid, NULL);

        return kind == OBJ_BLOB;
 }
 
        return kind == OBJ_BLOB;
 }
 


@@ -365,7 +365,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
        if (ds->fn && !ds->fn(oid, ds->cb_data))
                return 0;
 
        if (ds->fn && !ds->fn(oid, ds->cb_data))
                return 0;
 

-       type = sha1_object_info(oid->hash, NULL);
+       type = oid_object_info(oid, NULL);

        if (type == OBJ_COMMIT) {
                struct commit *commit = lookup_commit(oid);
                if (commit) {
        if (type == OBJ_COMMIT) {
                struct commit *commit = lookup_commit(oid);
                if (commit) {

diff --git a/streaming.c b/streaming.c
index 042d6082e83660773843ffc68841cd0c05c252b2..344678e95f21246a615916dfd946a3b095a9dd8a 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -117,7 +117,7 @@ static enum input_source istream_source(const unsigned char *sha1,
 
        oi->typep = type;
        oi->sizep = &size;
 
        oi->typep = type;
        oi->sizep = &size;

-       status = sha1_object_info_extended(oid.hash, oi, 0);
+       status = oid_object_info_extended(&oid, oi, 0);

        if (status < 0)
                return stream_error;
 
        if (status < 0)
                return stream_error;
 

diff --git a/submodule.c b/submodule.c
index c210640d35694c770c6983f84c9cee02588f84ff..a05c544e8dad2600ba196e43fd58b953c6ba3d1b 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -817,7 +817,7 @@ static int check_has_commit(const struct object_id *oid, void *data)
 {
        struct has_commit_data *cb = data;
 
 {
        struct has_commit_data *cb = data;
 

-       enum object_type type = sha1_object_info(oid->hash, NULL);
+       enum object_type type = oid_object_info(oid, NULL);

 
        switch (type) {
        case OBJ_COMMIT:
 
        switch (type) {
        case OBJ_COMMIT:

diff --git a/tag.c b/tag.c
index a6e0abce67c6b10b37fb9540061e8746dff051ce..db3e31034ca49a35a0919db08429510f636f2586 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -41,7 +41,7 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
        unsigned long size;
        int ret;
 
        unsigned long size;
        int ret;
 

-       type = sha1_object_info(oid->hash, NULL);
+       type = oid_object_info(oid, NULL);

        if (type != OBJ_TAG)
                return error("%s: cannot verify a non-tag object of type %s.",
                                name_to_report ?
        if (type != OBJ_TAG)
                return error("%s: cannot verify a non-tag object of type %s.",
                                name_to_report ?