diff options
| author | Christian Hesse | 2018-11-20 17:31:21 +0100 |
|---|---|---|
| committer | Christian Hesse | 2018-12-09 23:28:26 +0100 |
| commit | 55ebd5e97ccd0da9424d68f1e0f301551cf4b47a (patch) | |
| tree | 22434f290c916aa4cb49dfd330dd5459158d9d46 /shared.c | |
| parent | ui-blame: set repo for sb (diff) | |
| download | cgit-55ebd5e97ccd0da9424d68f1e0f301551cf4b47a.tar.gz cgit-55ebd5e97ccd0da9424d68f1e0f301551cf4b47a.zip | |
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.c | 2 |
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, | |||
| 325 | diff_params.flags |= XDF_IGNORE_WHITESPACE; | 325 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
| 326 | emit_params.ctxlen = context > 0 ? context : 3; | 326 | emit_params.ctxlen = context > 0 ? context : 3; |
| 327 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 327 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
| 328 | emit_cb.outf = filediff_cb; | 328 | emit_cb.out_line = filediff_cb; |
| 329 | emit_cb.priv = fn; | 329 | emit_cb.priv = fn; |
| 330 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 330 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
| 331 | if (file1.size) | 331 | if (file1.size) |