reftable: implement refname validation

[thirdparty/git.git] / object-file.c

diff --git a/object-file.c b/object-file.c
index 3d27dc8dea333778a9592335ad98f9c4472cb874..7bfd5e6e2e904db6ed8d3d85f6497ce891e95962 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -164,7 +164,6 @@ static void git_hash_unknown_final_oid(struct object_id *oid, git_hash_ctx *ctx)
        BUG("trying to finalize unknown hash");
 }
 
-
 const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
        {
                NULL,
@@ -183,8 +182,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
        },
        {
                "sha1",
-               /* "sha1", big-endian */
-               0x73686131,
+               GIT_SHA1_FORMAT_ID,
                GIT_SHA1_RAWSZ,
                GIT_SHA1_HEXSZ,
                GIT_SHA1_BLKSZ,
@@ -199,8 +197,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
        },
        {
                "sha256",
-               /* "s256", big-endian */
-               0x73323536,
+               GIT_SHA256_FORMAT_ID,
                GIT_SHA256_RAWSZ,
                GIT_SHA256_HEXSZ,
                GIT_SHA256_BLKSZ,
@@ -2474,7 +2471,7 @@ struct oidtree *odb_loose_cache(struct object_directory *odb,
        struct strbuf buf = STRBUF_INIT;
        size_t word_bits = bitsizeof(odb->loose_objects_subdir_seen[0]);
        size_t word_index = subdir_nr / word_bits;
-       size_t mask = 1 << (subdir_nr % word_bits);
+       size_t mask = 1u << (subdir_nr % word_bits);
        uint32_t *bitmap;
 
        if (subdir_nr < 0 ||