diff options
| author | Christian Hesse | 2022-04-04 21:00:33 +0200 |
|---|---|---|
| committer | Yigit Sever | 2023-07-21 03:03:48 +0300 |
| commit | d8b6edb6c15b3fc9e2f0a1881804cefad19e62b6 (patch) | |
| tree | 15f30f009d8c9b949269932ef35aa7f2192cb623 | |
| parent | 57963ff4e38cd88ab3794cc48def7d5699b2180a (diff) | |
| download | cgit-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-- | 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; |
