about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-09-29 22:17:07 +0200
committerChristian Hesse <mail@eworm.de>2016-10-04 09:47:18 +0200
commit9dd3c5e93c5af3d35efe6e9f844456eb0f27a819 (patch)
treec8b7445029cf9bdb2d640bf555bd77c1439a1c3a
parentui-tag: replace 'unsigned char sha1[20]' with 'struct object_id oid' (diff)
downloadcgit-pink-9dd3c5e93c5af3d35efe6e9f844456eb0f27a819.tar.gz
cgit-pink-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,
  */
 void cgit_print_tree(const char *rev, char *path)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 	struct commit *commit;
 	struct pathspec_item path_items = {
 		.match = path,
@@ -375,12 +375,12 @@ void cgit_print_tree(const char *rev, char *path)
 	if (!rev)
 		rev = ctx.qry.head;
 
-	if (get_sha1(rev, sha1)) {
+	if (get_oid(rev, &oid)) {
 		cgit_print_error_page(404, "Not found",
 			"Invalid revision name: %s", rev);
 		return;
 	}
-	commit = lookup_commit_reference(sha1);
+	commit = lookup_commit_reference(oid.hash);
 	if (!commit || parse_commit(commit)) {
 		cgit_print_error_page(404, "Not found",
 			"Invalid commit reference: %s", rev);