From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 27457 invoked from network); 16 Mar 2021 10:39:57 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 16 Mar 2021 10:39:57 -0000 Received: by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 90db8deb; Tue, 16 Mar 2021 10:39:39 +0000 (UTC) Return-Path: Received: from mx.mylinuxtime.de (mx.mylinuxtime.de [2a01:4f8:13a:16c2::25]) by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id 94bea4bc (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Tue, 16 Mar 2021 10:39:38 +0000 (UTC) Received: from leda.eworm.de (p54b79d46.dip0.t-ipconnect.de [84.183.157.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx.mylinuxtime.de (Postfix) with ESMTPSA id E52EDF86A8; Tue, 16 Mar 2021 11:32:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eworm.de; s=mail; t=1615890752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=cr67A06EIdusAvz0S1Xj9LMPOxBqaN2wKHx/6e1Njaw=; b=KMtinvKWXZI4on2W+bfp3yKNDAQ4BMqshukF5KsMNTujTY+w/g4H7NtRdNgF3XVSGoNXwV zb5g0hRO++h1ZNIHNM6sgJzESxhGujIuZby1uow21QsPEG8OBCr7AX3EY9iZnVodAI4kw1 z8b1T7gX7imq5EkGQDv4Iz/a+Zk+Olo= Received: by leda.eworm.de (Postfix, from userid 1000) id 421CC1A1635; Tue, 16 Mar 2021 11:32:02 +0100 (CET) From: Christian Hesse To: cgit@lists.zx2c4.com Cc: Christian Hesse Subject: [PATCH 1/1] git: update to v2.31.0 Date: Tue, 16 Mar 2021 11:31:55 +0100 Message-Id: <20210316103155.48855-1-list@eworm.de> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mx.mylinuxtime.de; auth=pass smtp.auth=smtp-only@eworm.de smtp.mailfrom=eworm@leda.eworm.de X-Rspamd-Server: mx X-Stat-Signature: d85fesie9ka89micwk5eefaq36io8xiy X-Rspamd-Queue-Id: E52EDF86A8 X-Spamd-Result: default: False [-1.18 / 15.00]; ARC_NA(0.00)[]; GENERIC_REPUTATION(0.00)[-0.75233475537198]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-2.97)[-0.991]; DKIM_SIGNED(0.00)[]; NEURAL_HAM_SHORT(-0.41)[-0.408]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; FORGED_SENDER(0.30)[list@eworm.de,eworm@leda.eworm.de]; RCVD_COUNT_ZERO(0.00)[0]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:3320, ipnet:84.128.0.0/10, country:DE]; FROM_NEQ_ENVFROM(0.00)[list@eworm.de,eworm@leda.eworm.de]; BAYES_HAM(-3.00)[100.00%] X-BeenThere: cgit@lists.zx2c4.com X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: List for cgit developers and users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cgit-bounces@lists.zx2c4.com Sender: "CGit" From: Christian Hesse 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 --- 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 = -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(""); 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: