aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-11-20 17:31:21 +0100
committerChristian Hesse <mail@eworm.de>2018-12-09 23:28:26 +0100
commit55ebd5e97ccd0da9424d68f1e0f301551cf4b47a (patch)
tree22434f290c916aa4cb49dfd330dd5459158d9d46
parent441dac1d747dab43e3559ee68f18a273512064cd (diff)
downloadcgit-55ebd5e97ccd0da9424d68f1e0f301551cf4b47a.tar.gz
cgit-55ebd5e97ccd0da9424d68f1e0f301551cf4b47a.tar.bz2
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--Makefile2
m---------git0
-rw-r--r--shared.c2
-rw-r--r--ui-snapshot.c1
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)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.19.1
+GIT_VER = 2.20.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
-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,
diff_params.flags |= XDF_IGNORE_WHITESPACE;
emit_params.ctxlen = context > 0 ? context : 3;
emit_params.flags = XDL_EMIT_FUNCNAMES;
- emit_cb.outf = filediff_cb;
+ emit_cb.out_line = filediff_cb;
emit_cb.priv = fn;
xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
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,
ctx.page.mimetype = xstrdup(format->mimetype);
ctx.page.filename = xstrdup(filename);
cgit_print_http_headers();
+ init_archivers();
format->write_func(hex, prefix);
return 0;
}