aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2020-10-20 23:46:09 +0200
committerChristian Hesse <mail@eworm.de>2020-10-20 23:57:12 +0200
commita4de0e810b69710c3b32f6d253d80d16dec09f36 (patch)
treebae0b334de05e134d06b48aeb888a3bf134a705a
parent779631c6dc23c15bbbf45a7c7ab9fffb619037b7 (diff)
downloadcgit-a4de0e810b69710c3b32f6d253d80d16dec09f36.tar.gz
cgit-a4de0e810b69710c3b32f6d253d80d16dec09f36.tar.bz2
global: replace hard coded hash length
With sha1 we had a guaranteed length of 40 hex chars. This changes now that we have to support sha256 with 64 hex chars... Support both. Signed-off-by: Christian Hesse <mail@eworm.de>
-rwxr-xr-xfilters/commit-links.sh2
-rw-r--r--parsing.c5
-rwxr-xr-xtests/t0105-commit.sh2
-rw-r--r--ui-patch.c2
4 files changed, 5 insertions, 6 deletions
diff --git a/filters/commit-links.sh b/filters/commit-links.sh
index 5881952..796ac30 100755
--- a/filters/commit-links.sh
+++ b/filters/commit-links.sh
@@ -19,7 +19,7 @@ regex=''
# This expression generates links to commits referenced by their SHA1.
regex=$regex'
-s|\b([0-9a-fA-F]{7,40})\b|<a href="./?id=\1">\1</a>|g'
+s|\b([0-9a-fA-F]{7,64})\b|<a href="./?id=\1">\1</a>|g'
# This expression generates links to a fictional bugtracker.
regex=$regex'
diff --git a/parsing.c b/parsing.c
index e647dba..72b59b3 100644
--- a/parsing.c
+++ b/parsing.c
@@ -127,7 +127,6 @@ static int end_of_header(const char *p)
struct commitinfo *cgit_parse_commit(struct commit *commit)
{
- 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 +139,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 += oid_hex_len + 1;
+ p += the_hash_algo->hexsz + 1;
while (skip_prefix(p, "parent ", &p))
- p += oid_hex_len + 1;
+ p += the_hash_algo->hexsz + 1;
if (p && skip_prefix(p, "author ", &p)) {
parse_user(p, &ret->author, &ret->author_email,
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh
index 9cdf55c..1a12ee3 100755
--- a/tests/t0105-commit.sh
+++ b/tests/t0105-commit.sh
@@ -25,7 +25,7 @@ test_expect_success 'get root commit' '
'
test_expect_success 'root commit contains diffstat' '
- grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" tmp
+ grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40,64\}.>file-1</a>" tmp
'
test_expect_success 'root commit contains diff' '
diff --git a/ui-patch.c b/ui-patch.c
index 5a96410..4ac03cb 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -61,7 +61,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
}
if (is_null_oid(&old_rev_oid)) {
- memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
+ memcpy(rev_range, oid_to_hex(&new_rev_oid), the_hash_algo->hexsz + 1);
} else {
xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),
oid_to_hex(&new_rev_oid));