diff options
-rw-r--r-- | Makefile | 2 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | ui-log.c | 2 |
3 files changed, 2 insertions, 2 deletions
@@ -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.3 | 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 d516b2db0af2221bd6b13e7347abdcb5830b282 | Subproject 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1 | ||
@@ -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; |