|
diff --git a/shared.c b/shared.c index c7cd8a5..f20fb5c 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -339,40 +339,40 @@ int cgit_diff_files(const unsigned char *old_sha1, |
339 | diff_params.flags = XDF_NEED_MINIMAL; |
339 | diff_params.flags = XDF_NEED_MINIMAL; |
340 | emit_params.ctxlen = 3; |
340 | emit_params.ctxlen = 3; |
341 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
341 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
342 | emit_cb.outf = filediff_cb; |
342 | emit_cb.outf = filediff_cb; |
343 | emit_cb.priv = fn; |
343 | emit_cb.priv = fn; |
344 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
344 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
345 | return 0; |
345 | return 0; |
346 | } |
346 | } |
347 | |
347 | |
348 | void cgit_diff_tree(const unsigned char *old_sha1, |
348 | void cgit_diff_tree(const unsigned char *old_sha1, |
349 | const unsigned char *new_sha1, |
349 | const unsigned char *new_sha1, |
350 | filepair_fn fn) |
350 | filepair_fn fn) |
351 | { |
351 | { |
352 | struct diff_options opt; |
352 | struct diff_options opt; |
353 | int ret; |
353 | int ret; |
354 | |
354 | |
355 | diff_setup(&opt); |
355 | diff_setup(&opt); |
356 | opt.output_format = DIFF_FORMAT_CALLBACK; |
356 | opt.output_format = DIFF_FORMAT_CALLBACK; |
357 | opt.detect_rename = 1; |
357 | opt.detect_rename = 1; |
358 | opt.recursive = 1; |
358 | opt.recursive = 1; |
359 | opt.format_callback = cgit_diff_tree_cb; |
359 | opt.format_callback = cgit_diff_tree_cb; |
360 | opt.format_callback_data = fn; |
360 | opt.format_callback_data = fn; |
361 | diff_setup_done(&opt); |
361 | diff_setup_done(&opt); |
362 | |
362 | |
363 | if (old_sha1) |
363 | if (old_sha1 && !is_null_sha1(old_sha1)) |
364 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
364 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
365 | else |
365 | else |
366 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
366 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
367 | diffcore_std(&opt); |
367 | diffcore_std(&opt); |
368 | diff_flush(&opt); |
368 | diff_flush(&opt); |
369 | } |
369 | } |
370 | |
370 | |
371 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
371 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
372 | { |
372 | { |
373 | unsigned char *old_sha1 = NULL; |
373 | unsigned char *old_sha1 = NULL; |
374 | |
374 | |
375 | if (commit->parents) |
375 | if (commit->parents) |
376 | old_sha1 = commit->parents->item->object.sha1; |
376 | old_sha1 = commit->parents->item->object.sha1; |
377 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); |
377 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); |
378 | } |
378 | } |
|