mirror of
https://git.zx2c4.com/cgit
synced 2024-11-09 10:08:42 +00:00
commit: move layout into page function
This allows us to return a proper HTTP status code when an object is not found by switching from cgit_print_error() to cgit_print_error_page(). Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
parent
51d9176e4b
commit
c53a15c77a
2
cmd.c
2
cmd.c
@ -157,7 +157,7 @@ struct cgit_cmd *cgit_get_cmd(void)
|
||||
def_cmd(atom, 1, 0, 0, 0),
|
||||
def_cmp(about, 0, 0, 0, 0),
|
||||
def_cmd(blob, 1, 0, 0, 0),
|
||||
def_cmd(commit, 1, 1, 1, 0),
|
||||
def_cmd(commit, 1, 0, 1, 0),
|
||||
def_cmd(diff, 1, 1, 1, 0),
|
||||
def_cmd(info, 1, 0, 0, 1),
|
||||
def_cmd(log, 1, 1, 1, 0),
|
||||
|
@ -27,12 +27,14 @@ void cgit_print_commit(char *hex, const char *prefix)
|
||||
hex = ctx.qry.head;
|
||||
|
||||
if (get_sha1(hex, sha1)) {
|
||||
cgit_print_error("Bad object id: %s", hex);
|
||||
cgit_print_error_page(400, "Bad request",
|
||||
"Bad object id: %s", hex);
|
||||
return;
|
||||
}
|
||||
commit = lookup_commit_reference(sha1);
|
||||
if (!commit) {
|
||||
cgit_print_error("Bad commit reference: %s", hex);
|
||||
cgit_print_error_page(404, "Not found",
|
||||
"Bad commit reference: %s", hex);
|
||||
return;
|
||||
}
|
||||
info = cgit_parse_commit(commit);
|
||||
@ -41,6 +43,7 @@ void cgit_print_commit(char *hex, const char *prefix)
|
||||
|
||||
load_ref_decorations(DECORATE_FULL_REFS);
|
||||
|
||||
cgit_print_layout_start();
|
||||
cgit_print_diff_ctrls();
|
||||
html("<table summary='commit info' class='commit-info'>\n");
|
||||
html("<tr><th>author</th><td>");
|
||||
@ -139,4 +142,5 @@ void cgit_print_commit(char *hex, const char *prefix)
|
||||
}
|
||||
strbuf_release(¬es);
|
||||
cgit_free_commitinfo(info);
|
||||
cgit_print_layout_end();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user