summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h2
-rw-r--r--ui-diff.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/cgit.c b/cgit.c
index c86d290..1b85b15 100644
--- a/cgit.c
+++ b/cgit.c
@@ -104,13 +104,13 @@ static void cgit_print_repo_page(struct cacheitem *item)
104 cgit_print_commit(cgit_query_sha1); 104 cgit_print_commit(cgit_query_sha1);
105 break; 105 break;
106 case CMD_TAG: 106 case CMD_TAG:
107 cgit_print_tag(cgit_query_sha1); 107 cgit_print_tag(cgit_query_sha1);
108 break; 108 break;
109 case CMD_DIFF: 109 case CMD_DIFF:
110 cgit_print_diff(cgit_query_sha1, cgit_query_sha2); 110 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
111 break; 111 break;
112 default: 112 default:
113 cgit_print_error("Invalid request"); 113 cgit_print_error("Invalid request");
114 } 114 }
115 cgit_print_docend(); 115 cgit_print_docend();
116} 116}
diff --git a/cgit.h b/cgit.h
index 5ef0bc5..e96311f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -235,13 +235,13 @@ extern void cgit_print_repolist(struct cacheitem *item);
235extern void cgit_print_summary(); 235extern void cgit_print_summary();
236extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); 236extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
237extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); 237extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
238extern void cgit_print_tree(const char *rev, char *path); 238extern void cgit_print_tree(const char *rev, char *path);
239extern void cgit_print_commit(char *hex); 239extern void cgit_print_commit(char *hex);
240extern void cgit_print_tag(char *revname); 240extern void cgit_print_tag(char *revname);
241extern void cgit_print_diff(const char *new_hex, const char *old_hex); 241extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
242extern void cgit_print_snapshot(struct cacheitem *item, const char *head, 242extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
243 const char *hex, const char *prefix, 243 const char *hex, const char *prefix,
244 const char *filename, int snapshot); 244 const char *filename, int snapshot);
245extern void cgit_print_snapshot_links(const char *repo, const char *head, 245extern void cgit_print_snapshot_links(const char *repo, const char *head,
246 const char *hex, int snapshots); 246 const char *hex, int snapshots);
247extern int cgit_parse_snapshots_mask(const char *str); 247extern int cgit_parse_snapshots_mask(const char *str);
diff --git a/ui-diff.c b/ui-diff.c
index 11a2ff8..ba0030f 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -86,13 +86,13 @@ static void filepair_cb(struct diff_filepair *pair)
86 return; 86 return;
87 } 87 }
88 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 88 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
89 cgit_print_error("Error running diff"); 89 cgit_print_error("Error running diff");
90} 90}
91 91
92void cgit_print_diff(const char *new_rev, const char *old_rev) 92void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
93{ 93{
94 unsigned char sha1[20], sha2[20]; 94 unsigned char sha1[20], sha2[20];
95 enum object_type type; 95 enum object_type type;
96 unsigned long size; 96 unsigned long size;
97 struct commit *commit, *commit2; 97 struct commit *commit, *commit2;
98 98
@@ -130,10 +130,10 @@ void cgit_print_diff(const char *new_rev, const char *old_rev)
130 commit2 = lookup_commit_reference(sha2); 130 commit2 = lookup_commit_reference(sha2);
131 if (!commit2 || parse_commit(commit2)) 131 if (!commit2 || parse_commit(commit2))
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 html("<table class='diff'>"); 134 html("<table class='diff'>");
135 html("<tr><td>"); 135 html("<tr><td>");
136 cgit_diff_tree(sha2, sha1, filepair_cb, NULL); 136 cgit_diff_tree(sha2, sha1, filepair_cb, prefix);
137 html("</td></tr>"); 137 html("</td></tr>");
138 html("</table>"); 138 html("</table>");
139} 139}