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>
author: Christian Hesse 2022-04-18 22:17:39 +0200
committer: June McEnroe 2022-05-13 15:42:03 -0400
commit: 3374b0e7a6a4a221e7778f6c8294beef987bcd27 (patch)
tree: 244a879bb51762e5c979099b1bf585a6e2de8e0a
parent: Use release_commit_memory() (diff)
download: cgit-3374b0e7a6a4a221e7778f6c8294beef987bcd27.tar.gz
cgit-3374b0e7a6a4a221e7778f6c8294beef987bcd27.zip
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bc4ed1a..7035d5e 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.1
+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 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1
+Subproject 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1
diff --git a/ui-log.c b/ui-log.c
index 82476e0..cfa9192 100644
--- a/ui-log.c
+++ b/ui-log.c

@@ -163,7 +163,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;
author	Christian Hesse	2022-04-18 22:17:39 +0200
committer	June McEnroe	2022-05-13 15:42:03 -0400
commit	3374b0e7a6a4a221e7778f6c8294beef987bcd27 (patch)
tree	244a879bb51762e5c979099b1bf585a6e2de8e0a
parent	Use release_commit_memory() (diff)
download	cgit-3374b0e7a6a4a221e7778f6c8294beef987bcd27.tar.gz cgit-3374b0e7a6a4a221e7778f6c8294beef987bcd27.zip

diff --git a/Makefile b/Makefile index bc4ed1a..7035d5e 100644 --- a/Makefile +++ b/Makefile
@@ -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.35.1	17	GIT_VER = 2.36.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 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1		Subproject 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1


diff --git a/ui-log.c b/ui-log.c index 82476e0..cfa9192 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -163,7 +163,7 @@ static int show_commit(struct commit commit, struct rev_info revs)
163	"", &revs->diffopt);	163	"", &revs->diffopt);
164	diffcore_std(&revs->diffopt);	164	diffcore_std(&revs->diffopt);
165		165
166	found = !diff_queue_is_empty();	166	found = !diff_queue_is_empty(&revs->diffopt);
167	saved_fmt = revs->diffopt.output_format;	167	saved_fmt = revs->diffopt.output_format;
168	revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;	168	revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
169	revs->diffopt.format_callback = cgit_diff_tree_cb;	169	revs->diffopt.format_callback = cgit_diff_tree_cb;