about summary refs log tree commit diff
path: root/ui-patch.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-06-22 16:15:48 +0200
committerLars Hjemli <hjemli@gmail.com>2010-06-22 16:15:48 +0200
commit37a24e4e39737edaa5cdde501346a65eeb280e63 (patch)
treeff23eb0d57edf108edd1aa3e64a8d6cf70062954 /ui-patch.c
parentFix style of commit-filter links in commit-subject. (diff)
parentui-shared.c: path-limit style nitpick (diff)
downloadcgit-pink-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz
cgit-pink-37a24e4e39737edaa5cdde501346a65eeb280e63.zip
Merge branch 'jh/path-limit'
Conflicts:
	cgit.h
	ui-commit.c
Diffstat (limited to '')
-rw-r--r--ui-patch.c6
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
@@ -77,7 +77,7 @@ static void filepair_cb(struct diff_filepair *pair)
 		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;
@@ -122,7 +122,9 @@ void cgit_print_patch(char *hex)
 			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);