about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-09-29 22:08:19 +0200
committerChristian Hesse <mail@eworm.de>2016-10-04 09:47:18 +0200
commit073a8bb3963d53630826ee43f6feefb5a9660dc0 (patch)
treefca6db1229b9d7a5a7508f188d2f7dea974ecbae
parentui-patch: replace 'unsigned char sha1[20]' with 'struct object_id oid' (diff)
downloadcgit-magenta-073a8bb3963d53630826ee43f6feefb5a9660dc0.tar.xz
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...
-rw-r--r--ui-plain.c6
1 files 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;