diff options
| author | Christian Hesse <mail@eworm.de> | 2021-03-15T21·48+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·14+0300 |
| commit | bf4cfeb477960db31f8bb105f4524635418142fd (patch) | |
| tree | 6adca1270975ffcda359f3b064d8e40b9dcaa86c | |
| parent | 847d037a022add8103440e5ac3b08b8afc03d2b5 (diff) | |
chore(3p/cgit): git: update to v2.31.0 r/2899
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> Change-Id: Idb3abf22eb68ba5219f22075811884bbce786c3b
| -rw-r--r-- | third_party/cgit/Makefile | 2 | ||||
| -rw-r--r-- | third_party/cgit/ui-log.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/third_party/cgit/Makefile b/third_party/cgit/Makefile index a4e597b7edc1..11b437b24bcc 100644 --- a/third_party/cgit/Makefile +++ b/third_party/cgit/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/third_party/cgit/ui-log.c b/third_party/cgit/ui-log.c index 6914f75e65e4..20774bf82fa5 100644 --- a/third_party/cgit/ui-log.c +++ b/third_party/cgit/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: |