[PATCH 1/1] git: update to v2.36.0

[Christian Hesse]

From: Christian Hesse <mail at eworm.de>

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 at eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 ui-log.c | 2 +-
 3 files changed, 3 insertions(+), 3 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
index d516b2d..6cd33dc 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d516b2db0af2221bd6b13e7347abdcb5830b2829
+Subproject commit 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e
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;
-- 
2.36.0