X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/f4f1339fe62fb1a28c147567195a86dd99485e25..c83db796a1cf6893de275e78b98cef10eccc1200:/ui-diff.c diff --git a/ui-diff.c b/ui-diff.c index 3ed0a46..5c864d9 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -38,7 +38,6 @@ static void header(unsigned char *sha1, char *path1, int mode1, int subproject; subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); - html(""); html("
"); html("diff --git a/"); html_txt(path1); @@ -97,14 +96,18 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, unsigned long size; struct commit *commit; + html(""); + html(""); + html("
"); + if (head && !old_hex && !new_hex) { get_sha1(head, sha1); commit = lookup_commit_reference(sha1); - if (commit && !parse_commit(commit)) { - html(""); + if (commit && !parse_commit(commit)) cgit_diff_commit(commit, filepair_cb); - html("
"); - } + else + cgit_print_error(fmt("Bad commit: %s", head)); + html("
"); return; } @@ -120,14 +123,11 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, } } - html(""); switch(type) { case OBJ_BLOB: - html(""); break; case OBJ_TREE: cgit_diff_tree(sha1, sha2, filepair_cb); @@ -137,5 +137,6 @@ void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, typename(type))); break; } - html("
"); header(sha1, path, 0644, sha2, path, 0644); if (cgit_diff_files(sha1, sha2, print_line)) cgit_print_error("Error running diff"); - html("
"); + html(""); + html(""); }