|
diff --git a/cgit.h b/cgit.h index e3d9cb8..5ef0bc5 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -171,5 +171,5 @@ extern int cgit_diff_files(const unsigned char *old_sha1, |
171 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
171 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
172 | const unsigned char *new_sha1, |
172 | const unsigned char *new_sha1, |
173 | filepair_fn fn); |
173 | filepair_fn fn, const char *prefix); |
174 | |
174 | |
175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
|
|
diff --git a/shared.c b/shared.c index 0a6a5ed..3d4feea 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -387,8 +387,9 @@ int cgit_diff_files(const unsigned char *old_sha1, |
387 | void cgit_diff_tree(const unsigned char *old_sha1, |
387 | void 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); |
@@ -399,4 +400,10 @@ void cgit_diff_tree(const unsigned char *old_sha1, |
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 | |
@@ -415,4 +422,4 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
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 | } |
|
|
diff --git a/ui-diff.c b/ui-diff.c index 0be845f..11a2ff8 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -132,8 +132,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev) |
132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); |
132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); |
133 | } |
133 | } |
134 | |
| |
135 | html("<table class='diff'>"); |
134 | html("<table class='diff'>"); |
136 | html("<tr><td>"); |
135 | html("<tr><td>"); |
137 | cgit_diff_tree(sha2, sha1, filepair_cb); |
136 | cgit_diff_tree(sha2, sha1, filepair_cb, NULL); |
138 | html("</td></tr>"); |
137 | html("</td></tr>"); |
139 | html("</table>"); |
138 | html("</table>"); |
|