diff options
author | Christian Hesse | 2021-03-15 22:48:26 +0100 |
---|---|---|
committer | Christian Hesse | 2021-03-16 11:28:43 +0100 |
commit | d889cae811f27a052317ac5aea23890cba414760 (patch) | |
tree | a5ebd57e2b7fdb1c131dbf17c2a183a548f6db18 | |
parent | 4ffadc1e0c589f9bcfb4a721f5625914ef2d496d (diff) | |
download | cgit-d889cae811f27a052317ac5aea23890cba414760.tar.gz cgit-d889cae811f27a052317ac5aea23890cba414760.tar.bz2 cgit-d889cae811f27a052317ac5aea23890cba414760.zip |
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>
-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) | |||
14 | pdfdir = $(docdir) | 14 | pdfdir = $(docdir) |
15 | mandir = $(prefix)/share/man | 15 | mandir = $(prefix)/share/man |
16 | SHA1_HEADER = <openssl/sha.h> | 16 | SHA1_HEADER = <openssl/sha.h> |
17 | GIT_VER = 2.30.1 | 17 | GIT_VER = 2.31.0 |
18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz | 18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz |
19 | INSTALL = install | 19 | INSTALL = install |
20 | COPYTREE = cp -r | 20 | COPYTREE = cp -r |
diff --git a/git b/git | |||
Subproject 773e25afc41b1b6533fa9ae2cd825d0b4a697fa | Subproject a5828ae6b52137b913b978e16cd2334482eb4c1 | ||
@@ -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: |