List for cgit developers and users
 help / color / mirror / Atom feed
* [PATCH 1/1] git: update to v2.31.0
@ 2021-03-16 10:31 Christian Hesse
  0 siblings, 0 replies; only message in thread
From: Christian Hesse @ 2021-03-16 10:31 UTC (permalink / raw)
  To: cgit; +Cc: Christian Hesse

From: Christian Hesse <mail@eworm.de>

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>
---
 Makefile | 2 +-
 git      | 2 +-
 ui-log.c | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a4e597b..11b437b 100644
--- a/Makefile
+++ b/Makefile
@@ -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
index 773e25a..a5828ae 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 773e25afc41b1b6533fa9ae2cd825d0b4a697fad
+Subproject commit a5828ae6b52137b913b978e16cd2334482eb4c1f
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:

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-03-16 10:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-16 10:31 [PATCH 1/1] git: update to v2.31.0 Christian Hesse

List for cgit developers and users

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/cgit

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 cgit cgit/ http://inbox.vuxu.org/cgit \
		cgit@lists.zx2c4.com
	public-inbox-index cgit

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.archive.cgit


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git