summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-01-15 23:20:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-15 23:20:29 (GMT)
commit8b327f1784d21c52bc177b5ca75665db388d6367 (patch)
tree6a2ac96412bbb0dbc86c9c84ba2c05146dbd0fb7 /commit.c
parent16a8055daebdf95ca4bb97e3efe07e87f588767e (diff)
parentbc626927575cea80b8bc5fd0dbb6c6439e34e606 (diff)
downloadgit-8b327f1784d21c52bc177b5ca75665db388d6367.zip
git-8b327f1784d21c52bc177b5ca75665db388d6367.tar.gz
git-8b327f1784d21c52bc177b5ca75665db388d6367.tar.bz2
Merge branch 'ma/sha1-is-a-hash'
Retire more names with "sha1" in it. * ma/sha1-is-a-hash: hash-lookup: rename from sha1-lookup sha1-lookup: rename `sha1_pos()` as `hash_pos()` object-file.c: rename from sha1-file.c object-name.c: rename from sha1-name.c
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index f128f18..bab8d5a 100644
--- a/commit.c
+++ b/commit.c
@@ -14,7 +14,7 @@
#include "mergesort.h"
#include "commit-slab.h"
#include "prio-queue.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "wt-status.h"
#include "advice.h"
#include "refs.h"
@@ -113,7 +113,7 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
int commit_graft_pos(struct repository *r, const unsigned char *sha1)
{
- return sha1_pos(sha1, r->parsed_objects->grafts,
+ return hash_pos(sha1, r->parsed_objects->grafts,
r->parsed_objects->grafts_nr,
commit_graft_sha1_access);
}