diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | ui-log.c | 7 | 
3 files changed, 5 insertions, 4 deletions
@@ -14,7 +14,7 @@ htmldir = $(docdir)  pdfdir = $(docdir)  mandir = $(prefix)/share/man  SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.30.1 +GIT_VER = 2.31.0  GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz  INSTALL = install  COPYTREE = cp -r diff --git a/git b/git -Subproject 773e25afc41b1b6533fa9ae2cd825d0b4a697fa +Subproject a5828ae6b52137b913b978e16cd2334482eb4c1 @@ -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:  |