aboutsummaryrefslogtreecommitdiffstats
path: root/ui-log.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2021-03-15 22:48:26 +0100
committerChristian Hesse <mail@eworm.de>2021-03-16 11:28:43 +0100
commitd889cae811f27a052317ac5aea23890cba414760 (patch)
treea5ebd57e2b7fdb1c131dbf17c2a183a548f6db18 /ui-log.c
parent4ffadc1e0c589f9bcfb4a721f5625914ef2d496d (diff)
downloadcgit-d889cae811f27a052317ac5aea23890cba414760.tar.gz
cgit-d889cae811f27a052317ac5aea23890cba414760.tar.bz2
cgit-d889cae811f27a052317ac5aea23890cba414760.zip
git: update to v2.31.0
Update to git version v2.31.0, this requires changes for these upstream commits: * 36a317929b8f0c67d77d54235f2d20751c576cbb refs: switch peel_ref() to peel_iterated_oid() Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-log.c')
-rw-r--r--ui-log.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ui-log.c b/ui-log.c
index 6914f75..20774bf 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -65,8 +65,9 @@ void show_commit_decorations(struct commit *commit)
return;
html("<span class='decoration'>");
while (deco) {
- struct object_id peeled;
+ struct object_id oid_tag, peeled;
int is_annotated = 0;
+
strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
switch(deco->type) {
case DECORATION_NONE:
@@ -79,8 +80,8 @@ void show_commit_decorations(struct commit *commit)
ctx.qry.showmsg, 0);
break;
case DECORATION_REF_TAG:
- if (!peel_ref(deco->name, &peeled))
- is_annotated = !oidcmp(&commit->object.oid, &peeled);
+ if (!read_ref(deco->name, &oid_tag) && !peel_iterated_oid(&oid_tag, &peeled))
+ is_annotated = !oideq(&oid_tag, &peeled);
cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
break;
case DECORATION_REF_REMOTE: