summaryrefslogtreecommitdiff
path: root/builtin/describe.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-06-20 07:41:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-20 17:44:22 (GMT)
commitd40abc8e95f75b529feb140178b69a3783c2d108 (patch)
treed0de753e3ef3e66b033f2b179441e504f71aa4a0 /builtin/describe.c
parentc0566d78aac1d5f8ff90c75f2d936487bb5a8d84 (diff)
downloadgit-d40abc8e95f75b529feb140178b69a3783c2d108.zip
git-d40abc8e95f75b529feb140178b69a3783c2d108.tar.gz
git-d40abc8e95f75b529feb140178b69a3783c2d108.tar.bz2
hashmap: convert sha1hash() to oidhash()
There are no callers left of sha1hash() that do not simply pass the "hash" member of a "struct object_id". Let's get rid of the outdated sha1-specific function and provide one that operates on the whole struct (even though the technique, taking the first few bytes of the hash, will remain the same). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/describe.c')
-rw-r--r--builtin/describe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index 0a5cde0..2001542 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -76,7 +76,7 @@ static int commit_name_neq(const void *unused_cmp_data,
static inline struct commit_name *find_commit_name(const struct object_id *peeled)
{
- return hashmap_get_from_hash(&names, sha1hash(peeled->hash), peeled);
+ return hashmap_get_from_hash(&names, oidhash(peeled), peeled);
}
static int replace_name(struct commit_name *e,
@@ -123,7 +123,7 @@ static void add_to_known_names(const char *path,
if (!e) {
e = xmalloc(sizeof(struct commit_name));
oidcpy(&e->peeled, peeled);
- hashmap_entry_init(e, sha1hash(peeled->hash));
+ hashmap_entry_init(e, oidhash(peeled));
hashmap_add(&names, e);
e->path = NULL;
}