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>

diff --git a/Makefile b/Makefile
index 4aaf2dc19d04a7073ef73b00128aeb7117ce8a30..e690c7f4bc3f9fd3109e0740d25eb2ca57b393f5 100644 (file)
--- 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
index cae598d9980661a978e2df4fb338518f7bf09572..5d826e972970a784bd7a7bdf587512510097b8c7 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit cae598d9980661a978e2df4fb338518f7bf09572
+Subproject commit 5d826e972970a784bd7a7bdf587512510097b8c7

diff --git a/shared.c b/shared.c
index 7560f5f3ea5dd7a0e56afd6c781963447d305960..a2c0d038165cd87f09329fc75117183bfca86d24 100644 (file)
--- 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 85efe64a0e7f6f41bedbddfe6722fb4db5a6832a..9461d51a5979cc4c4102c08b9c584914d74afd63 100644 (file)
--- 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;
 }