|
diff --git a/shared.c b/shared.c index 3926b4a..3778a5b 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -298,17 +298,16 @@ int cgit_diff_files(const unsigned char *old_sha1, |
298 | return 0; |
298 | return 0; |
299 | } |
299 | } |
300 | |
300 | |
301 | void cgit_diff_tree(const unsigned char *old_sha1, |
301 | void cgit_diff_tree(const unsigned char *old_sha1, |
302 | const unsigned char *new_sha1, |
302 | const unsigned char *new_sha1, |
303 | filepair_fn fn, const char *prefix, int ignorews) |
303 | filepair_fn fn, const char *prefix, int ignorews) |
304 | { |
304 | { |
305 | struct diff_options opt; |
305 | struct diff_options opt; |
306 | int ret; |
| |
307 | int prefixlen; |
306 | int prefixlen; |
308 | |
307 | |
309 | diff_setup(&opt); |
308 | diff_setup(&opt); |
310 | opt.output_format = DIFF_FORMAT_CALLBACK; |
309 | opt.output_format = DIFF_FORMAT_CALLBACK; |
311 | opt.detect_rename = 1; |
310 | opt.detect_rename = 1; |
312 | opt.rename_limit = ctx.cfg.renamelimit; |
311 | opt.rename_limit = ctx.cfg.renamelimit; |
313 | DIFF_OPT_SET(&opt, RECURSIVE); |
312 | DIFF_OPT_SET(&opt, RECURSIVE); |
314 | if (ignorews) |
313 | if (ignorews) |
@@ -319,19 +318,19 @@ void cgit_diff_tree(const unsigned char *old_sha1, |
319 | opt.nr_paths = 1; |
318 | opt.nr_paths = 1; |
320 | opt.paths = &prefix; |
319 | opt.paths = &prefix; |
321 | prefixlen = strlen(prefix); |
320 | prefixlen = strlen(prefix); |
322 | opt.pathlens = &prefixlen; |
321 | opt.pathlens = &prefixlen; |
323 | } |
322 | } |
324 | diff_setup_done(&opt); |
323 | diff_setup_done(&opt); |
325 | |
324 | |
326 | if (old_sha1 && !is_null_sha1(old_sha1)) |
325 | if (old_sha1 && !is_null_sha1(old_sha1)) |
327 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
326 | diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
328 | else |
327 | else |
329 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
328 | diff_root_tree_sha1(new_sha1, "", &opt); |
330 | diffcore_std(&opt); |
329 | diffcore_std(&opt); |
331 | diff_flush(&opt); |
330 | diff_flush(&opt); |
332 | } |
331 | } |
333 | |
332 | |
334 | void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) |
333 | void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) |
335 | { |
334 | { |
336 | unsigned char *old_sha1 = NULL; |
335 | unsigned char *old_sha1 = NULL; |
337 | |
336 | |
|