crtxcr
/
cgitsb
1
0
Forka 0
Codice Problemi Pull Requests Rilasci Wiki Attività

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...
This commit is contained in:
Christian Hesse 2016-09-29 22:08:19 +02:00
parent 85793b8181
commit 073a8bb396
1 ha cambiato i file con 3 aggiunte e 3 eliminazioni
Mostra statistiche Scarica il file Patch Scarica il file Diff Expand all files Collapse all files

6
ui-plain.c
Vedi File

@ -164,7 +164,7 @@ static int basedir_len(const char *path)
void cgit_print_plain(void) void cgit_print_plain(void)
{ {
const char *rev = ctx.qry.sha1; const char *rev = ctx.qry.sha1;
unsigned char sha1[20]; struct object_id oid;
struct commit *commit; struct commit *commit;
struct pathspec_item path_items = { struct pathspec_item path_items = {
.match = ctx.qry.path, .match = ctx.qry.path,
@ -181,11 +181,11 @@ void cgit_print_plain(void)
if (!rev) if (!rev)
rev = ctx.qry.head; rev = ctx.qry.head;
if (get_sha1(rev, sha1)) { if (get_oid(rev, &oid)) {
cgit_print_error_page(404, "Not found", "Not found"); cgit_print_error_page(404, "Not found", "Not found");
return; return;
} }
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(oid.hash);
if (!commit || parse_commit(commit)) { if (!commit || parse_commit(commit)) {
cgit_print_error_page(404, "Not found", "Not found"); cgit_print_error_page(404, "Not found", "Not found");
return; return;