cgit

commit 073a8bb3963d53630826ee43f6feefb5a9660dc0

Author: Christian Hesse <mail@eworm.de>

ui-plain: replace 'unsigned char sha1[20]' with 'struct object_id oid'

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...

 ui-plain.c | 6 +++---


diff --git a/ui-plain.c b/ui-plain.c
index 97cf6394e7021f6a2935b1d98a632eb1da8f81ba..8d541e3a1463fbf7dc5ded8f0fd873fcb5f603c2 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -164,7 +164,7 @@
 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 @@
 	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;