summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 3c4d52a..5c864d9 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -85,48 +85,50 @@ static void filepair_cb(struct diff_filepair *pair)
85 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 85 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
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 *head, const char *old_hex, const char *new_hex, char *path) 92void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
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; 97 struct commit *commit;
98 98
99 html("<table class='diff'>"); 99 html("<table class='diff'>");
100 html("<tr><td>"); 100 html("<tr><td>");
101 101
102 if (head && !old_hex && !new_hex) { 102 if (head && !old_hex && !new_hex) {
103 get_sha1(head, sha1); 103 get_sha1(head, sha1);
104 commit = lookup_commit_reference(sha1); 104 commit = lookup_commit_reference(sha1);
105 if (commit && !parse_commit(commit)) 105 if (commit && !parse_commit(commit))
106 cgit_diff_commit(commit, filepair_cb); 106 cgit_diff_commit(commit, filepair_cb);
107 else 107 else
108 cgit_print_error(fmt("Bad commit: %s", head)); 108 cgit_print_error(fmt("Bad commit: %s", head));
109 html("</td></tr>");
110 html("</table>");
109 return; 111 return;
110 } 112 }
111 113
112 get_sha1(old_hex, sha1); 114 get_sha1(old_hex, sha1);
113 get_sha1(new_hex, sha2); 115 get_sha1(new_hex, sha2);
114 116
115 type = sha1_object_info(sha1, &size); 117 type = sha1_object_info(sha1, &size);
116 if (type == OBJ_BAD) { 118 if (type == OBJ_BAD) {
117 type = sha1_object_info(sha2, &size); 119 type = sha1_object_info(sha2, &size);
118 if (type == OBJ_BAD) { 120 if (type == OBJ_BAD) {
119 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); 121 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
120 return; 122 return;
121 } 123 }
122 } 124 }
123 125
124 switch(type) { 126 switch(type) {
125 case OBJ_BLOB: 127 case OBJ_BLOB:
126 header(sha1, path, 0644, sha2, path, 0644); 128 header(sha1, path, 0644, sha2, path, 0644);
127 if (cgit_diff_files(sha1, sha2, print_line)) 129 if (cgit_diff_files(sha1, sha2, print_line))
128 cgit_print_error("Error running diff"); 130 cgit_print_error("Error running diff");
129 break; 131 break;
130 case OBJ_TREE: 132 case OBJ_TREE:
131 cgit_diff_tree(sha1, sha2, filepair_cb); 133 cgit_diff_tree(sha1, sha2, filepair_cb);
132 break; 134 break;