diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:15:48 +0200 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:15:48 +0200 | 
| commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) | |
| tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /ui-patch.c | |
| parent | Fix style of commit-filter links in commit-subject. (diff) | |
| parent | ui-shared.c: path-limit style nitpick (diff) | |
| download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2 cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip  | |
Merge branch 'jh/path-limit'
Conflicts:
	cgit.h
	ui-commit.c
Diffstat (limited to '')
| -rw-r--r-- | ui-patch.c | 6 | 
1 files changed, 4 insertions, 2 deletions
@@ -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);  |