mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-24 01:18:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

git: update to v2.31.0

Browse Source 
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>
This commit is contained in:
Christian Hesse 2021-03-15 22:48:26 +01:00
parent 4ffadc1e0c
commit d889cae811
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir) pdfdir = $(docdir)
mandir = $(prefix)/share/man mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h> 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 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install INSTALL = install
COPYTREE = cp -r COPYTREE = cp -r

2
git

@ -1 +1 @@
Subproject commit 773e25afc41b1b6533fa9ae2cd825d0b4a697fad Subproject commit a5828ae6b52137b913b978e16cd2334482eb4c1f

7
ui-log.c
View File

@ -65,8 +65,9 @@ void show_commit_decorations(struct commit *commit)
return; return;
html("<span class='decoration'>"); html("<span class='decoration'>");
while (deco) { 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)); strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
switch(deco->type) { switch(deco->type) {
case DECORATION_NONE: case DECORATION_NONE:
@ -79,8 +80,8 @@ void show_commit_decorations(struct commit *commit)
ctx.qry.showmsg, 0); ctx.qry.showmsg, 0);
break; break;
case DECORATION_REF_TAG: case DECORATION_REF_TAG:
if (!peel_ref(deco->name, &peeled)) if (!read_ref(deco->name, &oid_tag) && !peel_iterated_oid(&oid_tag, &peeled))
is_annotated = !oidcmp(&commit->object.oid, &peeled); is_annotated = !oideq(&oid_tag, &peeled);
cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf); cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
break; break;
case DECORATION_REF_REMOTE: case DECORATION_REF_REMOTE: