aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse2022-04-04 21:00:33 +0200
committerYigit Sever2023-07-21 03:03:48 +0300
commitd8b6edb6c15b3fc9e2f0a1881804cefad19e62b6 (patch)
tree15f30f009d8c9b949269932ef35aa7f2192cb623
parent57963ff4e38cd88ab3794cc48def7d5699b2180a (diff)
downloadcgit-d8b6edb6c15b3fc9e2f0a1881804cefad19e62b6.tar.gz
cgit-d8b6edb6c15b3fc9e2f0a1881804cefad19e62b6.tar.bz2
cgit-d8b6edb6c15b3fc9e2f0a1881804cefad19e62b6.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 1e0819b..b2db586 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
14pdfdir = $(docdir) 14pdfdir = $(docdir)
15mandir = $(prefix)/share/man 15mandir = $(prefix)/share/man
16SHA1_HEADER = <openssl/sha.h> 16SHA1_HEADER = <openssl/sha.h>
17GIT_VER = 2.35.3 17GIT_VER = 2.36.0
18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz 18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
19INSTALL = install 19INSTALL = install
20COPYTREE = cp -r 20COPYTREE = cp -r
diff --git a/git b/git
Subproject d516b2db0af2221bd6b13e7347abdcb5830b282 Subproject 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1
diff --git a/ui-log.c b/ui-log.c
index 22f9ca1..29a99a3 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
159 "", &revs->diffopt); 159 "", &revs->diffopt);
160 diffcore_std(&revs->diffopt); 160 diffcore_std(&revs->diffopt);
161 161
162 found = !diff_queue_is_empty(); 162 found = !diff_queue_is_empty(&revs->diffopt);
163 saved_fmt = revs->diffopt.output_format; 163 saved_fmt = revs->diffopt.output_format;
164 revs->diffopt.output_format = DIFF_FORMAT_CALLBACK; 164 revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
165 revs->diffopt.format_callback = cgit_diff_tree_cb; 165 revs->diffopt.format_callback = cgit_diff_tree_cb;