about summary refs log tree commit diff
path: root/parsing.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2020-10-20 23:32:45 +0200
committerChristian Hesse <mail@eworm.de>2020-10-20 23:57:12 +0200
commit779631c6dc23c15bbbf45a7c7ab9fffb619037b7 (patch)
tree99ddcae06134e97ef490fb1a4c9f6ab095ca5052 /parsing.c
parentgit: update to v2.29.0 (diff)
downloadcgit-pink-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.tar.gz
cgit-pink-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.zip
global: replace references to 'sha1' with 'oid'
For some time now sha1 is considered broken and upstream is working to
replace it with sha256. Replace all references to 'sha1' with 'oid',
just as upstream does.

Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to '')
-rw-r--r--parsing.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/parsing.c b/parsing.c
index 93b4767..e647dba 100644
--- a/parsing.c
+++ b/parsing.c
@@ -127,7 +127,7 @@ static int end_of_header(const char *p)
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
-	const int sha1hex_len = 40;
+	const int oid_hex_len = 40;
 	struct commitinfo *ret;
 	const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
 	const char *t;
@@ -140,10 +140,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 
 	if (!skip_prefix(p, "tree ", &p))
 		die("Bad commit: %s", oid_to_hex(&commit->object.oid));
-	p += sha1hex_len + 1;
+	p += oid_hex_len + 1;
 
 	while (skip_prefix(p, "parent ", &p))
-		p += sha1hex_len + 1;
+		p += oid_hex_len + 1;
 
 	if (p && skip_prefix(p, "author ", &p)) {
 		parse_user(p, &ret->author, &ret->author_email,