mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

git: update to v2.36.0

Browse Source 
Update to git version v2.36.0, this requires changes for these
upstream commits:

* 95433eeed9eac439eb21eb30105354b15e71302e
  diff: add ability to insert additional headers for paths

Signed-off-by: Christian Hesse <mail@eworm.de>
This commit is contained in:
Christian Hesse 2022-04-04 21:00:33 +02:00
parent cc9b717c87
commit bb02e24ec2
3 changed files with 3 additions and 3 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.35.3 GIT_VER = 2.36.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 d516b2db0af2221bd6b13e7347abdcb5830b2829 Subproject commit 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e

2
ui-log.c
View File

@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
"", &revs->diffopt); "", &revs->diffopt);
diffcore_std(&revs->diffopt); diffcore_std(&revs->diffopt);
found = !diff_queue_is_empty(); found = !diff_queue_is_empty(&revs->diffopt);
saved_fmt = revs->diffopt.output_format; saved_fmt = revs->diffopt.output_format;
revs->diffopt.output_format = DIFF_FORMAT_CALLBACK; revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
revs->diffopt.format_callback = cgit_diff_tree_cb; revs->diffopt.format_callback = cgit_diff_tree_cb;