object-file API: have hash_object_file() take "enum object_type"

Change the hash_object_file() function to take an "enum
object_type".

Since a preceding commit all of its callers are passing either
"{commit,tree,blob,tag}_type", or the result of a call to type_name(),
the parse_object() caller that would pass NULL is now using
stream_object_signature().

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/apply.c b/apply.c
index e82a7c30f01c5aa297ec3ccc3f684d3fc165cc22..8513755e254d70ab5a81afbcf3d0d741371a5be3 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -3157,7 +3157,7 @@ static int apply_binary(struct apply_state *state,
                 * See if the old one matches what the patch
                 * applies to.
                 */
-               hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
+               hash_object_file(the_hash_algo, img->buf, img->len, OBJ_BLOB,
                                 &oid);
                if (strcmp(oid_to_hex(&oid), patch->old_oid_prefix))
                        return error(_("the patch applies to '%s' (%s), "
@@ -3203,7 +3203,7 @@ static int apply_binary(struct apply_state *state,
                                     name);
 
                /* verify that the result matches */
-               hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
+               hash_object_file(the_hash_algo, img->buf, img->len, OBJ_BLOB,
                                 &oid);
                if (strcmp(oid_to_hex(&oid), patch->new_oid_prefix))
                        return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 319859db30e6e88344b2da4e9f7588dbde6611e9..52aebeb5214b4379e05bdcbcd9ac4e0ebc3dc768 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -300,7 +300,7 @@ static void export_blob(const struct object_id *oid)
                if (!buf)
                        die("could not read blob %s", oid_to_hex(oid));
                if (check_object_signature(the_repository, oid, buf, size,
-                                          type_name(type)) < 0)
+                                          type) < 0)
                        die("oid mismatch in blob %s", oid_to_hex(oid));
                object = parse_object_buffer(the_repository, oid, type,
                                             size, buf, &eaten);

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index e1927205a7b42a422b76bcd3d1d527404dc41b82..d0c3e0966b7075979c94781b15abdc9377c4216d 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -970,7 +970,7 @@ static struct base_data *resolve_delta(struct object_entry *delta_obj,
        if (!result_data)
                bad_object(delta_obj->idx.offset, _("failed to apply delta"));
        hash_object_file(the_hash_algo, result_data, result_size,
-                        type_name(delta_obj->real_type), &delta_obj->idx.oid);
+                        delta_obj->real_type, &delta_obj->idx.oid);
        sha1_object(result_data, NULL, result_size, delta_obj->real_type,
                    &delta_obj->idx.oid);
 
@@ -1413,7 +1413,7 @@ static void fix_unresolved_deltas(struct hashfile *f)
                        continue;
 
                if (check_object_signature(the_repository, &d->oid, data, size,
-                                          type_name(type)) < 0)
+                                          type) < 0)
                        die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
 
                /*

diff --git a/builtin/mktag.c b/builtin/mktag.c
index 4d28eceeba62183d4cda3c04739177406aead9e7..14b9fe3bc0a536ccaf5f6a1009a1e65a39d12f33 100644 (file)
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -62,7 +62,7 @@ static int verify_object_in_tag(struct object_id *tagged_oid, int *tagged_type)
 
        repl = lookup_replace_object(the_repository, tagged_oid);
        ret = check_object_signature(the_repository, repl, buffer, size,
-                                    type_name(*tagged_type));
+                                    *tagged_type);
        free(buffer);
 
        return ret;

diff --git a/builtin/replace.c b/builtin/replace.c
index 995ca683302a1539028cfde5ae7a543ff206f638..53a3b246570488cc2258c947d755b9dec05e652f 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -409,7 +409,7 @@ static int check_one_mergetag(struct commit *commit,
        int i;
 
        hash_object_file(the_hash_algo, extra->value, extra->len,
-                        type_name(OBJ_TAG), &tag_oid);
+                        OBJ_TAG, &tag_oid);
        tag = lookup_tag(the_repository, &tag_oid);
        if (!tag)
                return error(_("bad mergetag in commit '%s'"), ref);

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 808041551fdf58e07c4af6837ff0bce2bad10022..dbeb0680a5856300e3a14db9387193a5fe65a0fc 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -266,7 +266,7 @@ static void write_object(unsigned nr, enum object_type type,
        } else {
                struct object *obj;
                int eaten;
-               hash_object_file(the_hash_algo, buf, size, type_name(type),
+               hash_object_file(the_hash_algo, buf, size, type,
                                 &obj_list[nr].oid);
                added_object(nr, type, buf, size);
                obj = parse_object_buffer(the_repository, &obj_list[nr].oid,

diff --git a/cache-tree.c b/cache-tree.c
index fdbbd191d2261b39e05171c6c804984ea6b04e28..6752f69d515e12f7bd8c98ac2e27548b68da46d5 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -432,14 +432,14 @@ static int update_one(struct cache_tree *it,
        if (repair) {
                struct object_id oid;
                hash_object_file(the_hash_algo, buffer.buf, buffer.len,
-                                tree_type, &oid);
+                                OBJ_TREE, &oid);
                if (has_object_file_with_flags(&oid, OBJECT_INFO_SKIP_FETCH_OBJECT))
                        oidcpy(&it->oid, &oid);
                else
                        to_invalidate = 1;
        } else if (dryrun) {
                hash_object_file(the_hash_algo, buffer.buf, buffer.len,
-                                tree_type, &it->oid);
+                                OBJ_TREE, &it->oid);
        } else if (write_object_file_flags(buffer.buf, buffer.len, OBJ_TREE,
                                           &it->oid, flags & WRITE_TREE_SILENT
                                           ? HASH_SILENT : 0)) {
@@ -948,7 +948,7 @@ static int verify_one(struct repository *r,
                strbuf_addf(&tree_buf, "%o %.*s%c", mode, entlen, name, '\0');
                strbuf_add(&tree_buf, oid->hash, r->hash_algo->rawsz);
        }
-       hash_object_file(r->hash_algo, tree_buf.buf, tree_buf.len, tree_type,
+       hash_object_file(r->hash_algo, tree_buf.buf, tree_buf.len, OBJ_TREE,
                         &new_oid);
        if (!oideq(&new_oid, &it->oid))
                BUG("cache-tree for path %.*s does not match. "

diff --git a/cache.h b/cache.h
index c068f99c793beb5dd48c29faad3c4ec12f1a8c31..2027803c49ab3877efabf91a2c163fd5c62f92e0 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1327,7 +1327,8 @@ int parse_loose_header(const char *hdr, struct object_info *oi);
  * what we expected, but it might also indicate another error.
  */
 int check_object_signature(struct repository *r, const struct object_id *oid,
-                          void *buf, unsigned long size, const char *type);
+                          void *map, unsigned long size,
+                          enum object_type type);
 
 /**
  * A streaming version of check_object_signature().

diff --git a/convert.c b/convert.c
index df7186bd813a2eebabeb57bb6ef0bef2d8b5cc9b..d88072fe3207b9231f52a8ed471f13cd99054bff 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -1159,7 +1159,7 @@ static int ident_to_worktree(const char *src, size_t len,
        /* are we "faking" in place editing ? */
        if (src == buf->buf)
                to_free = strbuf_detach(buf, NULL);
-       hash_object_file(the_hash_algo, src, len, "blob", &oid);
+       hash_object_file(the_hash_algo, src, len, OBJ_BLOB, &oid);
 
        strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3));
        for (;;) {

diff --git a/diffcore-rename.c b/diffcore-rename.c
index bebd4ed6a42a1612f666f9221010479bc1263ccd..c0422d9e709a65d5a77d1444fcff0a4d313299bd 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -261,7 +261,7 @@ static unsigned int hash_filespec(struct repository *r,
                if (diff_populate_filespec(r, filespec, NULL))
                        return 0;
                hash_object_file(r->hash_algo, filespec->data, filespec->size,
-                                "blob", &filespec->oid);
+                                OBJ_BLOB, &filespec->oid);
        }
        return oidhash(&filespec->oid);
 }

diff --git a/dir.c b/dir.c
index d91295f2bcdcf86f0b1c41a32ac6a17d5d3cf65e..5674e8a62569adb2e0930f42a6dcf2f45e23f0db 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -1113,7 +1113,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
                                       &istate->cache[pos]->oid);
                        else
                                hash_object_file(the_hash_algo, buf, size,
-                                                "blob", &oid_stat->oid);
+                                                OBJ_BLOB, &oid_stat->oid);
                        fill_stat_data(&oid_stat->stat, &st);
                        oid_stat->valid = 1;
                }

diff --git a/log-tree.c b/log-tree.c
index d3e7a40b648c7dc6eb30880ac3e04908342a8b09..27a5b0bd61a3aaf558da3aaf9412619d2e6f94fe 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -561,7 +561,7 @@ static int show_one_mergetag(struct commit *commit,
        struct strbuf signature = STRBUF_INIT;
 
        hash_object_file(the_hash_algo, extra->value, extra->len,
-                        type_name(OBJ_TAG), &oid);
+                        OBJ_TAG, &oid);
        tag = lookup_tag(the_repository, &oid);
        if (!tag)
                return -1; /* error message already given */

diff --git a/object-file.c b/object-file.c
index 9e5b849693ee42691a33c9cd32b0621ddbcff769..b1cb78c44196ecb4514010b3d19b7462d252dbd9 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -1067,7 +1067,8 @@ int format_object_header(char *str, size_t size, enum object_type type,
 }
 
 int check_object_signature(struct repository *r, const struct object_id *oid,
-                          void *buf, unsigned long size, const char *type)
+                          void *buf, unsigned long size,
+                          enum object_type type)
 {
        struct object_id real_oid;
 
@@ -1676,7 +1677,7 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type,
 {
        struct cached_object *co;
 
-       hash_object_file(the_hash_algo, buf, len, type_name(type), oid);
+       hash_object_file(the_hash_algo, buf, len, type, oid);
        if (has_object_file_with_flags(oid, OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT) ||
            find_cached_object(oid))
                return 0;
@@ -1850,15 +1851,23 @@ static int write_buffer(int fd, const void *buf, size_t len)
        return 0;
 }
 
-void hash_object_file(const struct git_hash_algo *algo, const void *buf,
-                    unsigned long len, const char *type,
-                    struct object_id *oid)
+static void hash_object_file_literally(const struct git_hash_algo *algo,
+                                      const void *buf, unsigned long len,
+                                      const char *type, struct object_id *oid)
 {
        char hdr[MAX_HEADER_LEN];
        int hdrlen = sizeof(hdr);
+
        write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
 }
 
+void hash_object_file(const struct git_hash_algo *algo, const void *buf,
+                     unsigned long len, enum object_type type,
+                     struct object_id *oid)
+{
+       hash_object_file_literally(algo, buf, len, type_name(type), oid);
+}
+
 /* Finalize a file on disk, and close it. */
 static void close_loose_object(int fd)
 {
@@ -2161,9 +2170,7 @@ static int index_mem(struct index_state *istate,
        if (write_object)
                ret = write_object_file(buf, size, type, oid);
        else
-               hash_object_file(the_hash_algo, buf, size, type_name(type),
-                                oid);
-
+               hash_object_file(the_hash_algo, buf, size, type, oid);
        if (re_allocated)
                free(buf);
        return ret;
@@ -2189,8 +2196,8 @@ static int index_stream_convert_blob(struct index_state *istate,
                ret = write_object_file(sbuf.buf, sbuf.len, OBJ_BLOB,
                                        oid);
        else
-               hash_object_file(the_hash_algo, sbuf.buf, sbuf.len,
-                                type_name(OBJ_BLOB), oid);
+               hash_object_file(the_hash_algo, sbuf.buf, sbuf.len, OBJ_BLOB,
+                                oid);
        strbuf_release(&sbuf);
        return ret;
 }
@@ -2309,7 +2316,7 @@ int index_path(struct index_state *istate, struct object_id *oid,
                        return error_errno("readlink(\"%s\")", path);
                if (!(flags & HASH_WRITE_OBJECT))
                        hash_object_file(the_hash_algo, sb.buf, sb.len,
-                                        blob_type, oid);
+                                        OBJ_BLOB, oid);
                else if (write_object_file(sb.buf, sb.len, OBJ_BLOB, oid))
                        rc = error(_("%s: failed to insert into database"), path);
                strbuf_release(&sb);
@@ -2614,9 +2621,9 @@ int read_loose_object(const char *path,
                        git_inflate_end(&stream);
                        goto out;
                }
-               hash_object_file(the_repository->hash_algo,
-                                *contents, *size, oi->type_name->buf,
-                                real_oid);
+               hash_object_file_literally(the_repository->hash_algo,
+                                          *contents, *size,
+                                          oi->type_name->buf, real_oid);
                if (!oideq(expected_oid, real_oid))
                        goto out;
        }

diff --git a/object-store.h b/object-store.h
index 29169d117f74c629573df2551e44af57c68c42f5..bd2322ed8ce3368d8b06ab570f2f1f4c2217d757 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -246,7 +246,7 @@ static inline void *repo_read_object_file(struct repository *r,
 int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
 
 void hash_object_file(const struct git_hash_algo *algo, const void *buf,
-                     unsigned long len, const char *type,
+                     unsigned long len, enum object_type type,
                      struct object_id *oid);
 
 int write_object_file_flags(const void *buf, unsigned long len,

diff --git a/object.c b/object.c
index d07678ef6dafed94d8be0d6b34f892b2001fc07e..588b8156f1d634a5cb9c25038961ca9a0d28d255 100644 (file)
--- a/object.c
+++ b/object.c
@@ -289,8 +289,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
 
        buffer = repo_read_object_file(r, oid, &type, &size);
        if (buffer) {
-               if (check_object_signature(r, repl, buffer, size,
-                                          type_name(type)) < 0) {
+               if (check_object_signature(r, repl, buffer, size, type) < 0) {
                        free(buffer);
                        error(_("hash mismatch %s"), oid_to_hex(repl));
                        return NULL;

diff --git a/pack-check.c b/pack-check.c
index d8d8f91de6b9886400179db43a9428a6afc44112..bfb593ba7261a18a8283604f4e1cfdd10eb978f6 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -143,7 +143,7 @@ static int verify_packfile(struct repository *r,
                                    oid_to_hex(&oid), p->pack_name,
                                    (uintmax_t)entries[i].offset);
                else if (data && check_object_signature(r, &oid, data, size,
-                                                       type_name(type)) < 0)
+                                                       type) < 0)
                        err = error("packed %s from %s is corrupt",
                                    oid_to_hex(&oid), p->pack_name);
                else if (!data && stream_object_signature(r, &oid) < 0)