diff options
author | Christian Hesse <mail@eworm.de> | 2016-09-29 19:41:09 +0000 |
---|---|---|
committer | Christian Hesse <mail@eworm.de> | 2016-10-04 07:47:18 +0000 |
commit | 3a0fd5e6b881e6a38a6be9224db0cf93512c0b2b (patch) | |
tree | 3598b714bb3dfc4585987850bfe23f93a046e7bf | |
parent | 6e4b7b6776eb994e795fa38b2619db6c55e10ecc (diff) | |
download | cgit-3a0fd5e6b881e6a38a6be9224db0cf93512c0b2b.tar cgit-3a0fd5e6b881e6a38a6be9224db0cf93512c0b2b.tar.gz cgit-3a0fd5e6b881e6a38a6be9224db0cf93512c0b2b.zip |
ui-commit: 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-commit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui-commit.c b/ui-commit.c index 099d294..db69d54 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -19,19 +19,19 @@ void cgit_print_commit(char *hex, const char *prefix) struct commitinfo *info, *parent_info; struct commit_list *p; struct strbuf notes = STRBUF_INIT; - unsigned char sha1[20]; + struct object_id oid; char *tmp, *tmp2; int parents = 0; if (!hex) hex = ctx.qry.head; - if (get_sha1(hex, sha1)) { + if (get_oid(hex, &oid)) { cgit_print_error_page(400, "Bad request", "Bad object id: %s", hex); return; } - commit = lookup_commit_reference(sha1); + commit = lookup_commit_reference(oid.hash); if (!commit) { cgit_print_error_page(404, "Not found", "Bad commit reference: %s", hex); @@ -39,7 +39,7 @@ void cgit_print_commit(char *hex, const char *prefix) } info = cgit_parse_commit(commit); - format_display_notes(sha1, ¬es, PAGE_ENCODING, 0); + format_display_notes(oid.hash, ¬es, PAGE_ENCODING, 0); load_ref_decorations(DECORATE_FULL_REFS); |