about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorChristian Hesse2016-09-29 22:17:07 +0200
committerChristian Hesse2016-10-04 09:47:18 +0200
commit9dd3c5e93c5af3d35efe6e9f844456eb0f27a819 (patch)
treec8b7445029cf9bdb2d640bf555bd77c1439a1c3a
parentui-tag: replace 'unsigned char sha1[20]' with 'struct object_id oid' (diff)
downloadcgit-9dd3c5e93c5af3d35efe6e9f844456eb0f27a819.tar.gz
cgit-9dd3c5e93c5af3d35efe6e9f844456eb0f27a819.zip
ui-tree: 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-tree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui-tree.c b/ui-tree.c index b98a7f0..b310242 100644 --- a/ui-tree.c +++ b/ui-tree.c
@@ -357,7 +357,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base,
357 */ 357 */
358void cgit_print_tree(const char *rev, char *path) 358void cgit_print_tree(const char *rev, char *path)
359{ 359{
360 unsigned char sha1[20]; 360 struct object_id oid;
361 struct commit *commit; 361 struct commit *commit;
362 struct pathspec_item path_items = { 362 struct pathspec_item path_items = {
363 .match = path, 363 .match = path,
@@ -375,12 +375,12 @@ void cgit_print_tree(const char *rev, char *path)
375 if (!rev) 375 if (!rev)
376 rev = ctx.qry.head; 376 rev = ctx.qry.head;
377 377
378 if (get_sha1(rev, sha1)) { 378 if (get_oid(rev, &oid)) {
379 cgit_print_error_page(404, "Not found", 379 cgit_print_error_page(404, "Not found",
380 "Invalid revision name: %s", rev); 380 "Invalid revision name: %s", rev);
381 return; 381 return;
382 } 382 }
383 commit = lookup_commit_reference(sha1); 383 commit = lookup_commit_reference(oid.hash);
384 if (!commit || parse_commit(commit)) { 384 if (!commit || parse_commit(commit)) {
385 cgit_print_error_page(404, "Not found", 385 cgit_print_error_page(404, "Not found",
386 "Invalid commit reference: %s", rev); 386 "Invalid commit reference: %s", rev);