aboutsummaryrefslogtreecommitdiffstats
path: root/parsing.c
diff options
context:
space:
mode:
authorChristian Hesse2020-10-20 23:32:45 +0200
committerChristian Hesse2020-10-20 23:57:12 +0200
commit779631c6dc23c15bbbf45a7c7ab9fffb619037b7 (patch)
tree99ddcae06134e97ef490fb1a4c9f6ab095ca5052 /parsing.c
parent629659d2cffbf059374fc53e6400ff0bebe1ddde (diff)
downloadcgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.tar.gz
cgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.tar.bz2
cgit-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 'parsing.c')
-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)
127 127
128struct commitinfo *cgit_parse_commit(struct commit *commit) 128struct commitinfo *cgit_parse_commit(struct commit *commit)
129{ 129{
130 const int sha1hex_len = 40; 130 const int oid_hex_len = 40;
131 struct commitinfo *ret; 131 struct commitinfo *ret;
132 const char *p = repo_get_commit_buffer(the_repository, commit, NULL); 132 const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
133 const char *t; 133 const char *t;
@@ -140,10 +140,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
140 140
141 if (!skip_prefix(p, "tree ", &p)) 141 if (!skip_prefix(p, "tree ", &p))
142 die("Bad commit: %s", oid_to_hex(&commit->object.oid)); 142 die("Bad commit: %s", oid_to_hex(&commit->object.oid));
143 p += sha1hex_len + 1; 143 p += oid_hex_len + 1;
144 144
145 while (skip_prefix(p, "parent ", &p)) 145 while (skip_prefix(p, "parent ", &p))
146 p += sha1hex_len + 1; 146 p += oid_hex_len + 1;
147 147
148 if (p && skip_prefix(p, "author ", &p)) { 148 if (p && skip_prefix(p, "author ", &p)) {
149 parse_user(p, &ret->author, &ret->author_email, 149 parse_user(p, &ret->author, &ret->author_email,