diff options
| author | Christian Hesse <mail@eworm.de> | 2018-11-20 17:31:21 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2018-11-21 07:34:36 +0100 |
| commit | 074125dd88611a5faa69f127b326fd4157e36501 (patch) | |
| tree | 3c649f9c85524efbe600b1182ba2f154db69f96b | |
| parent | e5862157141a723659358b38bca525b5dcbab876 (diff) | |
| download | cgit-ch/git-2-20-0-rc0.tar.gz | |
RFC: git: update to v2.20.0-rc0ch/git-2-20-0-rc0
Update to git version v2.20.0-rc0. Required changes follow upstream commits:
* 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e
(xdiff: provide a separate emit callback for hunks)
| -rw-r--r-- | Makefile | 4 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | shared.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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.xz +GIT_VER = 2.20.0.rc0 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git -Subproject cae598d9980661a978e2df4fb338518f7bf0957 +Subproject 26aa9fc81d4c7f6c3b456a29da0b7ec72e5c659 @@ -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) |