diff options
| author | la-ninpre <leobrekalini@gmail.com> | 2021-07-07 15:23:56 +0300 |
|---|---|---|
| committer | la-ninpre <leobrekalini@gmail.com> | 2021-07-07 15:23:56 +0300 |
| commit | 81b5fdedf5da305954ea271a6d14ca996756553b (patch) | |
| tree | 956c9961af141b68bfdfa9aba1400a1859e8c24c /ui-log.c | |
| parent | 8699fe74f2c145747ee599051ba3286872e7a32b (diff) | |
| parent | 5258c297ba6fb604ae1415fbc19a3fe42457e49e (diff) | |
| download | cgit-81b5fdedf5da305954ea271a6d14ca996756553b.tar.gz cgit-81b5fdedf5da305954ea271a6d14ca996756553b.zip | |
Merge remote-tracking branch 'upstream/master' into git.aaoth.xyz
Diffstat (limited to 'ui-log.c')
| -rw-r--r-- | ui-log.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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: |