author | Lars Hjemli <hjemli@gmail.com> | 2007-09-04 09:04:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-04 09:04:47 (UTC) |
commit | 0de21a8d4176f15b4185a2e083787eeb05d95a77 (patch) (unidiff) | |
tree | 9504f1693e2ad921e687b736c3a38c0fe9e7a2e0 | |
parent | ff13396926f3352d9e29c0663154918297dc5af7 (diff) | |
download | cgit-0de21a8d4176f15b4185a2e083787eeb05d95a77.zip cgit-0de21a8d4176f15b4185a2e083787eeb05d95a77.tar.gz cgit-0de21a8d4176f15b4185a2e083787eeb05d95a77.tar.bz2 |
Set xdemitconf_t.findfunc=NULL
This function-pointer was introduced in git v1.5.3-rc0-42-gf258475. It
needs to have a value, and setting it to NULL triggers the old behaviour
for selecting hunk headers.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -370,12 +370,13 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
370 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 370 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
371 | return 1; | 371 | return 1; |
372 | 372 | ||
373 | diff_params.flags = XDF_NEED_MINIMAL; | 373 | diff_params.flags = XDF_NEED_MINIMAL; |
374 | emit_params.ctxlen = 3; | 374 | emit_params.ctxlen = 3; |
375 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 375 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
376 | emit_params.find_func = NULL; | ||
376 | emit_cb.outf = filediff_cb; | 377 | emit_cb.outf = filediff_cb; |
377 | emit_cb.priv = fn; | 378 | emit_cb.priv = fn; |
378 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 379 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
379 | return 0; | 380 | return 0; |
380 | } | 381 | } |
381 | 382 | ||