Merge branch 'jh/path-limit'

Conflicts:
	cgit.h
	ui-commit.c

1 files changed, 4 insertions, 2 deletions

diff --git a/ui-patch.c b/ui-patch.c
index 2a8f7a5..25dc9fe 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -74,13 +74,13 @@ static void filepair_cb(struct diff_filepair *pair)
                             &new_size, &binary, print_line))
                 html("Error running diff");
         if (binary)
                 html("Binary files differ\n");
 }
 
-void cgit_print_patch(char *hex)
+void cgit_print_patch(char *hex, const char *prefix)
 {
         struct commit *commit;
         struct commitinfo *info;
         unsigned char sha1[20], old_sha1[20];
         char *patchname;
 
@@ -119,11 +119,13 @@ void cgit_print_patch(char *hex)
         if (info->msg && *info->msg) {
                 htmlf("%s", info->msg);
                 if (info->msg[strlen(info->msg) - 1] != '\n')
                         html("\n");
         }
         html("---\n");
-        cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
+        if (prefix)
+                htmlf("(limited to '%s')\n\n", prefix);
+        cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix);
         html("--\n");
         htmlf("cgit %s\n", CGIT_VERSION);
         cgit_free_commitinfo(info);
 }