From: Christian Hesse <[email protected]> Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
Signed-off-by: Christian Hesse <[email protected]> --- ui-commit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui-commit.c b/ui-commit.c index 099d294..db69d54 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -19,19 +19,19 @@ void cgit_print_commit(char *hex, const char *prefix) struct commitinfo *info, *parent_info; struct commit_list *p; struct strbuf notes = STRBUF_INIT; - unsigned char sha1[20]; + struct object_id oid; char *tmp, *tmp2; int parents = 0; if (!hex) hex = ctx.qry.head; - if (get_sha1(hex, sha1)) { + if (get_oid(hex, &oid)) { cgit_print_error_page(400, "Bad request", "Bad object id: %s", hex); return; } - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(oid.hash); if (!commit) { cgit_print_error_page(404, "Not found", "Bad commit reference: %s", hex); @@ -39,7 +39,7 @@ void cgit_print_commit(char *hex, const char *prefix) } info = cgit_parse_commit(commit); - format_display_notes(sha1, ¬es, PAGE_ENCODING, 0); + format_display_notes(oid.hash, ¬es, PAGE_ENCODING, 0); load_ref_decorations(DECORATE_FULL_REFS); -- 2.10.0 _______________________________________________ CGit mailing list [email protected] http://lists.zx2c4.com/mailman/listinfo/cgit
