diff options
| author | Christian Hesse | 2018-11-20 17:31:21 +0100 |
|---|---|---|
| committer | Christian Hesse | 2018-12-09 23:28:26 +0100 |
| commit | 55ebd5e97ccd0da9424d68f1e0f301551cf4b47a (patch) | |
| tree | 22434f290c916aa4cb49dfd330dd5459158d9d46 | |
| parent | ui-blame: set repo for sb (diff) | |
| download | cgit-55ebd5e97ccd0da9424d68f1e0f301551cf4b47a.tar.gz cgit-55ebd5e97ccd0da9424d68f1e0f301551cf4b47a.zip | |
git: update to v2.20.0
Update to git version v2.20.0. Required changes follow upstream commits: * 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4 (archive: initialize archivers earlier) * 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e (xdiff: provide a separate emit callback for hunks) Signed-off-by: Christian Hesse <mail@eworm.de>
| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | shared.c | 2 | ||||
| -rw-r--r-- | ui-snapshot.c | 1 |
4 files changed, 3 insertions, 2 deletions
| diff --git a/Makefile b/Makefile index 4aaf2dc..e690c7f 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.19.1 | 17 | GIT_VER = 2.20.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 cae598d9980661a978e2df4fb338518f7bf0957 | Subproject 5d826e972970a784bd7a7bdf587512510097b8c | ||
| diff --git a/shared.c b/shared.c index 7560f5f..a2c0d03 100644 --- a/shared.c +++ b/shared.c | |||
| @@ -325,7 +325,7 @@ int cgit_diff_files(const struct object_id *old_oid, | |||
| 325 | diff_params.flags |= XDF_IGNORE_WHITESPACE; | 325 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
| 326 | emit_params.ctxlen = context > 0 ? context : 3; | 326 | emit_params.ctxlen = context > 0 ? context : 3; |
| 327 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 327 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
| 328 | emit_cb.outf = filediff_cb; | 328 | emit_cb.out_line = filediff_cb; |
| 329 | emit_cb.priv = fn; | 329 | emit_cb.priv = fn; |
| 330 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 330 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
| 331 | if (file1.size) | 331 | if (file1.size) |
| diff --git a/ui-snapshot.c b/ui-snapshot.c index 85efe64..9461d51 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
| @@ -156,6 +156,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format, | |||
| 156 | ctx.page.mimetype = xstrdup(format->mimetype); | 156 | ctx.page.mimetype = xstrdup(format->mimetype); |
| 157 | ctx.page.filename = xstrdup(filename); | 157 | ctx.page.filename = xstrdup(filename); |
| 158 | cgit_print_http_headers(); | 158 | cgit_print_http_headers(); |
| 159 | init_archivers(); | ||
| 159 | format->write_func(hex, prefix); | 160 | format->write_func(hex, prefix); |
| 160 | return 0; | 161 | return 0; |
| 161 | } | 162 | } |