diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2019-08-18 22:04:20 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-08-20 00:04:59 +0200 |
commit | 8d4d86b0f0a875e7916d7de083a88d7f11251406 (patch) | |
tree | 1b99e2d667ac3845e60f32e69862eed1a9b38ec6 /cache.h | |
parent | builtin/worktree: switch null_sha1 to null_oid (diff) | |
download | git-8d4d86b0f0a875e7916d7de083a88d7f11251406.tar.xz git-8d4d86b0f0a875e7916d7de083a88d7f11251406.zip |
cache: remove null_sha1
All of the existing uses of null_sha1 can be converted into uses of
null_oid, so do so. Remove null_sha1 and is_null_sha1, and define
is_null_oid in terms of null_oid. This also has the additional benefit
of removing several uses of sha1_to_hex.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -1029,7 +1029,6 @@ const char *repo_find_unique_abbrev(struct repository *r, const struct object_id int repo_find_unique_abbrev_r(struct repository *r, char *hex, const struct object_id *oid, int len); #define find_unique_abbrev_r(hex, oid, len) repo_find_unique_abbrev_r(the_repository, hex, oid, len) -extern const unsigned char null_sha1[GIT_MAX_RAWSZ]; extern const struct object_id null_oid; static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2) @@ -1064,14 +1063,9 @@ static inline int oideq(const struct object_id *oid1, const struct object_id *oi return hasheq(oid1->hash, oid2->hash); } -static inline int is_null_sha1(const unsigned char *sha1) -{ - return hasheq(sha1, null_sha1); -} - static inline int is_null_oid(const struct object_id *oid) { - return hasheq(oid->hash, null_sha1); + return oideq(oid, &null_oid); } static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src) |