From mboxrd@z Thu Jan 1 00:00:00 1970 From: list at eworm.de (Christian Hesse) Date: Tue, 4 Oct 2016 09:52:03 +0200 Subject: [PATCH 10/10] ui-tree: 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-10-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-tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui-tree.c b/ui-tree.c index b98a7f0..b310242 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -357,7 +357,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base, */ void cgit_print_tree(const char *rev, char *path) { - unsigned char sha1[20]; + struct object_id oid; struct commit *commit; struct pathspec_item path_items = { .match = path, @@ -375,12 +375,12 @@ void cgit_print_tree(const char *rev, char *path) if (!rev) rev = ctx.qry.head; - if (get_sha1(rev, sha1)) { + if (get_oid(rev, &oid)) { cgit_print_error_page(404, "Not found", "Invalid revision name: %s", rev); return; } - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(oid.hash); if (!commit || parse_commit(commit)) { cgit_print_error_page(404, "Not found", "Invalid commit reference: %s", rev); -- 2.10.0