From mboxrd@z Thu Jan 1 00:00:00 1970 From: list at eworm.de (Christian Hesse) Date: Tue, 4 Oct 2016 09:51:59 +0200 Subject: [PATCH 06/10] ui-plain: replace 'unsigned char sha1[20]' with 'struct object_id oid' In-Reply-To: <20161004075203.22115-1-list@eworm.de> References: <20161004095050.29c7859b@leda.localdomain> <20161004075203.22115-1-list@eworm.de> Message-ID: <20161004075203.22115-6-list@eworm.de> From: Christian Hesse 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 --- ui-plain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui-plain.c b/ui-plain.c index 97cf639..8d541e3 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -164,7 +164,7 @@ static int basedir_len(const char *path) void cgit_print_plain(void) { const char *rev = ctx.qry.sha1; - unsigned char sha1[20]; + struct object_id oid; struct commit *commit; struct pathspec_item path_items = { .match = ctx.qry.path, @@ -181,11 +181,11 @@ void cgit_print_plain(void) if (!rev) rev = ctx.qry.head; - if (get_sha1(rev, sha1)) { + if (get_oid(rev, &oid)) { cgit_print_error_page(404, "Not found", "Not found"); return; } - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(oid.hash); if (!commit || parse_commit(commit)) { cgit_print_error_page(404, "Not found", "Not found"); return; -- 2.10.0