summaryrefslogtreecommitdiff
path: root/shared.c
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 /shared.c
parent441dac1d747dab43e3559ee68f18a273512064cd (diff)
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>
Diffstat (limited to 'shared.c')
-rw-r--r--shared.c2
1 files changed, 1 insertions, 1 deletions
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)