|
diff --git a/shared.c b/shared.c index 72ac140..765cd27 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -329,31 +329,31 @@ void cgit_diff_tree(const unsigned char *old_sha1, |
329 | opt.pathlens = &prefixlen; |
329 | opt.pathlens = &prefixlen; |
330 | } |
330 | } |
331 | diff_setup_done(&opt); |
331 | diff_setup_done(&opt); |
332 | |
332 | |
333 | if (old_sha1 && !is_null_sha1(old_sha1)) |
333 | if (old_sha1 && !is_null_sha1(old_sha1)) |
334 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
334 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
335 | else |
335 | else |
336 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
336 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
337 | diffcore_std(&opt); |
337 | diffcore_std(&opt); |
338 | diff_flush(&opt); |
338 | diff_flush(&opt); |
339 | } |
339 | } |
340 | |
340 | |
341 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
341 | void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) |
342 | { |
342 | { |
343 | unsigned char *old_sha1 = NULL; |
343 | unsigned char *old_sha1 = NULL; |
344 | |
344 | |
345 | if (commit->parents) |
345 | if (commit->parents) |
346 | old_sha1 = commit->parents->item->object.sha1; |
346 | old_sha1 = commit->parents->item->object.sha1; |
347 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL, |
347 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix, |
348 | ctx.qry.ignorews); |
348 | ctx.qry.ignorews); |
349 | } |
349 | } |
350 | |
350 | |
351 | int cgit_parse_snapshots_mask(const char *str) |
351 | int cgit_parse_snapshots_mask(const char *str) |
352 | { |
352 | { |
353 | const struct cgit_snapshot_format *f; |
353 | const struct cgit_snapshot_format *f; |
354 | static const char *delim = " \t,:/|;"; |
354 | static const char *delim = " \t,:/|;"; |
355 | int tl, sl, rv = 0; |
355 | int tl, sl, rv = 0; |
356 | |
356 | |
357 | /* favor legacy setting */ |
357 | /* favor legacy setting */ |
358 | if(atoi(str)) |
358 | if(atoi(str)) |
359 | return 1; |
359 | return 1; |
|