[PATCH 1/1] RFC: git: update to v2.20.0-rc0

[Christian Hesse]

From: Christian Hesse <mail at eworm.de>

Update to git version v2.20.0-rc0. Required changes follow upstream commits:

* 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e
  (xdiff: provide a separate emit callback for hunks)

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 4 ++--
 git      | 2 +-
 shared.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1c49b50..11bf249 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.19.1
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
+GIT_VER = 2.20.0.rc0
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index cae598d..26aa9fc 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit cae598d9980661a978e2df4fb338518f7bf09572
+Subproject commit 26aa9fc81d4c7f6c3b456a29da0b7ec72e5c6595
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)