about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-log.c7
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile index a4e597b..11b437b 100644 --- a/Makefile +++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
14pdfdir = $(docdir) 14pdfdir = $(docdir)
15mandir = $(prefix)/share/man 15mandir = $(prefix)/share/man
16SHA1_HEADER = <openssl/sha.h> 16SHA1_HEADER = <openssl/sha.h>
17GIT_VER = 2.30.1 17GIT_VER = 2.31.0
18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz 18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
19INSTALL = install 19INSTALL = install
20COPYTREE = cp -r 20COPYTREE = cp -r
diff --git a/git b/git
Subproject 773e25afc41b1b6533fa9ae2cd825d0b4a697fa Subproject a5828ae6b52137b913b978e16cd2334482eb4c1
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)
65 return; 65 return;
66 html("<span class='decoration'>"); 66 html("<span class='decoration'>");
67 while (deco) { 67 while (deco) {
68 struct object_id peeled; 68 struct object_id oid_tag, peeled;
69 int is_annotated = 0; 69 int is_annotated = 0;
70
70 strlcpy(buf, prettify_refname(deco->name), sizeof(buf)); 71 strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
71 switch(deco->type) { 72 switch(deco->type) {
72 case DECORATION_NONE: 73 case DECORATION_NONE:
@@ -79,8 +80,8 @@ void show_commit_decorations(struct commit *commit)
79 ctx.qry.showmsg, 0); 80 ctx.qry.showmsg, 0);
80 break; 81 break;
81 case DECORATION_REF_TAG: 82 case DECORATION_REF_TAG:
82 if (!peel_ref(deco->name, &peeled)) 83 if (!read_ref(deco->name, &oid_tag) && !peel_iterated_oid(&oid_tag, &peeled))
83 is_annotated = !oidcmp(&commit->object.oid, &peeled); 84 is_annotated = !oideq(&oid_tag, &peeled);
84 cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf); 85 cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
85 break; 86 break;
86 case DECORATION_REF_REMOTE: 87 case DECORATION_REF_REMOTE: