aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2022-04-04 19:00:33 +0000
committerChristian Hesse <mail@eworm.de>2022-04-18 20:15:36 +0000
commitbb02e24ec23d7f1893fc746c8199e88ab849cf86 (patch)
tree2ddfef721940c23eb75012c33b19476c18a37f7d
parentcc9b717c875dcd33460b77383b417455b007061e (diff)
downloadcgit-bb02e24ec23d7f1893fc746c8199e88ab849cf86.tar
cgit-bb02e24ec23d7f1893fc746c8199e88ab849cf86.tar.gz
cgit-bb02e24ec23d7f1893fc746c8199e88ab849cf86.zip
git: update to v2.36.0
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>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-log.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index de72176..2509d21 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
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
INSTALL = install
COPYTREE = cp -r
diff --git a/git b/git
-Subproject d516b2db0af2221bd6b13e7347abdcb5830b282
+Subproject 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1
diff --git a/ui-log.c b/ui-log.c
index 20774bf..565929f 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
"", &revs->diffopt);
diffcore_std(&revs->diffopt);
- found = !diff_queue_is_empty();
+ found = !diff_queue_is_empty(&revs->diffopt);
saved_fmt = revs->diffopt.output_format;
revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
revs->diffopt.format_callback = cgit_diff_tree_cb;