git: update to v2.31.0

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>

diff --git a/Makefile b/Makefile
index a4e597b7edc1f365a00f7dff6ca9b79cbdd23c18..11b437b24bccf33aeafa608a0f6ec5d4b2a26103 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
 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
 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 773e25afc41b1b6533fa9ae2cd825d0b4a697fad..a5828ae6b52137b913b978e16cd2334482eb4c1f 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 773e25afc41b1b6533fa9ae2cd825d0b4a697fad
+Subproject commit a5828ae6b52137b913b978e16cd2334482eb4c1f

diff --git a/ui-log.c b/ui-log.c
index 6914f75e65e4cc2a313b690cab485b93b0ad3b4d..20774bf82fa5ce3f5450c33943af158308a7c2ce 100644 (file)
--- 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) {
                return;
        html("<span class='decoration'>");
        while (deco) {

-               struct object_id peeled;
+               struct object_id oid_tag, peeled;

                int is_annotated = 0;
                int is_annotated = 0;

+

                strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
                switch(deco->type) {
                case DECORATION_NONE:
                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:
                                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:
                        cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
                        break;
                case DECORATION_REF_REMOTE: