git: update to v2.34.1

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 6914f75e65e4cc2a313b690cab485b93b0ad3b4d..20774bf82fa5ce3f5450c33943af158308a7c2ce 100644 (file)
--- 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) {
                return;
        html("<span class='decoration'>");
        while (deco) {

-               struct object_id peeled;
+               struct object_id oid_tag, peeled;

                int is_annotated = 0;
                int is_annotated = 0;

+

                strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
                switch(deco->type) {
                case DECORATION_NONE:
                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:
                                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:
                        cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
                        break;
                case DECORATION_REF_REMOTE: