about summary refs log tree commit diff stats
path: root/ui-plain.c
diff options
context:
space:
mode:
authorChristian Hesse2016-09-29 22:08:19 +0200
committerChristian Hesse2016-10-04 09:47:18 +0200
commit073a8bb3963d53630826ee43f6feefb5a9660dc0 (patch)
treefca6db1229b9d7a5a7508f188d2f7dea974ecbae /ui-plain.c
parentui-patch: replace 'unsigned char sha1[20]' with 'struct object_id oid' (diff)
downloadcgit-073a8bb3963d53630826ee43f6feefb5a9660dc0.tar.gz
cgit-073a8bb3963d53630826ee43f6feefb5a9660dc0.zip
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...
Diffstat (limited to 'ui-plain.c')
-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)
164void cgit_print_plain(void) 164void cgit_print_plain(void)
165{ 165{
166 const char *rev = ctx.qry.sha1; 166 const char *rev = ctx.qry.sha1;
167 unsigned char sha1[20]; 167 struct object_id oid;
168 struct commit *commit; 168 struct commit *commit;
169 struct pathspec_item path_items = { 169 struct pathspec_item path_items = {
170 .match = ctx.qry.path, 170 .match = ctx.qry.path,
@@ -181,11 +181,11 @@ void cgit_print_plain(void)
181 if (!rev) 181 if (!rev)
182 rev = ctx.qry.head; 182 rev = ctx.qry.head;
183 183
184 if (get_sha1(rev, sha1)) { 184 if (get_oid(rev, &oid)) {
185 cgit_print_error_page(404, "Not found", "Not found"); 185 cgit_print_error_page(404, "Not found", "Not found");
186 return; 186 return;
187 } 187 }
188 commit = lookup_commit_reference(sha1); 188 commit = lookup_commit_reference(oid.hash);
189 if (!commit || parse_commit(commit)) { 189 if (!commit || parse_commit(commit)) {
190 cgit_print_error_page(404, "Not found", "Not found"); 190 cgit_print_error_page(404, "Not found", "Not found");
191 return; 191 return;