aboutsummaryrefslogtreecommitdiffstats
path: root/shared.c
diff options
context:
space:
mode:
Diffstat (limited to 'shared.c')
-rw-r--r--shared.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/shared.c b/shared.c
index 0a6a5ed..3d4feea 100644
--- a/shared.c
+++ b/shared.c
@@ -386,10 +386,11 @@ int cgit_diff_files(const unsigned char *old_sha1,
386 386
387void cgit_diff_tree(const unsigned char *old_sha1, 387void cgit_diff_tree(const unsigned char *old_sha1,
388 const unsigned char *new_sha1, 388 const unsigned char *new_sha1,
389 filepair_fn fn) 389 filepair_fn fn, const char *prefix)
390{ 390{
391 struct diff_options opt; 391 struct diff_options opt;
392 int ret; 392 int ret;
393 int prefixlen;
393 394
394 diff_setup(&opt); 395 diff_setup(&opt);
395 opt.output_format = DIFF_FORMAT_CALLBACK; 396 opt.output_format = DIFF_FORMAT_CALLBACK;
@@ -398,6 +399,12 @@ void cgit_diff_tree(const unsigned char *old_sha1,
398 opt.recursive = 1; 399 opt.recursive = 1;
399 opt.format_callback = cgit_diff_tree_cb; 400 opt.format_callback = cgit_diff_tree_cb;
400 opt.format_callback_data = fn; 401 opt.format_callback_data = fn;
402 if (prefix) {
403 opt.nr_paths = 1;
404 opt.paths = &prefix;
405 prefixlen = strlen(prefix);
406 opt.pathlens = &prefixlen;
407 }
401 diff_setup_done(&opt); 408 diff_setup_done(&opt);
402 409
403 if (old_sha1 && !is_null_sha1(old_sha1)) 410 if (old_sha1 && !is_null_sha1(old_sha1))
@@ -414,5 +421,5 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
414 421
415 if (commit->parents) 422 if (commit->parents)
416 old_sha1 = commit->parents->item->object.sha1; 423 old_sha1 = commit->parents->item->object.sha1;
417 cgit_diff_tree(old_sha1, commit->object.sha1, fn); 424 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
418} 425}