aboutsummaryrefslogtreecommitdiff
path: root/hash.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-04-08 14:28:17 -0700
committerJunio C Hamano <gitster@pobox.com>2025-04-08 14:28:17 -0700
commit0dfca9888191bcea4fa00fb3c7abda787e06cf75 (patch)
treeb1aaec26bf06b5679e256e298ba389aaf0ca1b00 /hash.h
parent9d22ac51228304102deb62f30c3ecba6377e1237 (diff)
parent7d70b29c4f0b2fd3c6698956d9fb4026632d9c6e (diff)
downloadgit-0dfca9888191bcea4fa00fb3c7abda787e06cf75.tar.xz
Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanup
* ps/object-wo-the-repository: hash: stop depending on `the_repository` in `null_oid()` hash: fix "-Wsign-compare" warnings object-file: split out logic regarding hash algorithms delta-islands: stop depending on `the_repository` object-file-convert: stop depending on `the_repository` pack-bitmap-write: stop depending on `the_repository` pack-revindex: stop depending on `the_repository` pack-check: stop depending on `the_repository` environment: move access to "core.bigFileThreshold" into repo settings pack-write: stop depending on `the_repository` and `the_hash_algo` object: stop depending on `the_repository` csum-file: stop depending on `the_repository`
Diffstat (limited to 'hash.h')
-rw-r--r--hash.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/hash.h b/hash.h
index 5e3c462dc5..23b7f92bd3 100644
--- a/hash.h
+++ b/hash.h
@@ -326,7 +326,7 @@ int hash_algo_by_name(const char *name);
/* Identical, except based on the format ID. */
int hash_algo_by_id(uint32_t format_id);
/* Identical, except based on the length. */
-int hash_algo_by_length(int len);
+int hash_algo_by_length(size_t len);
/* Identical, except for a pointer to struct git_hash_algo. */
static inline int hash_algo_by_ptr(const struct git_hash_algo *p)
{
@@ -341,7 +341,7 @@ static inline int hash_algo_by_ptr(const struct git_hash_algo *p)
const struct git_hash_algo *unsafe_hash_algo(const struct git_hash_algo *algop);
-const struct object_id *null_oid(void);
+const struct object_id *null_oid(const struct git_hash_algo *algop);
static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2, const struct git_hash_algo *algop)
{