crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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:17:07 +02:00
parent 28185ae40a
commit 9dd3c5e93c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-tree.c
View File

@ -357,7 +357,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base,
*/ */
void cgit_print_tree(const char *rev, char *path) void cgit_print_tree(const char *rev, char *path)
{ {
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 = path, .match = path,
@ -375,12 +375,12 @@ void cgit_print_tree(const char *rev, char *path)
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", cgit_print_error_page(404, "Not found",
"Invalid revision name: %s", rev); "Invalid revision name: %s", rev);
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", cgit_print_error_page(404, "Not found",
"Invalid commit reference: %s", rev); "Invalid commit reference: %s", rev);