diff options
author | Christian Hesse | 2016-09-29 22:08:19 +0200 |
---|---|---|
committer | Christian Hesse | 2016-10-04 09:47:18 +0200 |
commit | 073a8bb3963d53630826ee43f6feefb5a9660dc0 (patch) | |
tree | fca6db1229b9d7a5a7508f188d2f7dea974ecbae /ui-plain.c | |
parent | 85793b8181aa93ef6070f137fcb3caee624849b6 (diff) | |
download | cgit-073a8bb3963d53630826ee43f6feefb5a9660dc0.tar.gz cgit-073a8bb3963d53630826ee43f6feefb5a9660dc0.tar.bz2 cgit-073a8bb3963d53630826ee43f6feefb5a9660dc0.zip |
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...
Diffstat (limited to 'ui-plain.c')
-rw-r--r-- | ui-plain.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -164,7 +164,7 @@ static int basedir_len(const char *path) | |||
164 | void cgit_print_plain(void) | 164 | void cgit_print_plain(void) |
165 | { | 165 | { |
166 | const char *rev = ctx.qry.sha1; | 166 | const char *rev = ctx.qry.sha1; |
167 | unsigned char sha1[20]; | 167 | struct object_id oid; |
168 | struct commit *commit; | 168 | struct commit *commit; |
169 | struct pathspec_item path_items = { | 169 | struct pathspec_item path_items = { |
170 | .match = ctx.qry.path, | 170 | .match = ctx.qry.path, |
@@ -181,11 +181,11 @@ void cgit_print_plain(void) | |||
181 | if (!rev) | 181 | if (!rev) |
182 | rev = ctx.qry.head; | 182 | rev = ctx.qry.head; |
183 | 183 | ||
184 | if (get_sha1(rev, sha1)) { | 184 | if (get_oid(rev, &oid)) { |
185 | cgit_print_error_page(404, "Not found", "Not found"); | 185 | cgit_print_error_page(404, "Not found", "Not found"); |
186 | return; | 186 | return; |
187 | } | 187 | } |
188 | commit = lookup_commit_reference(sha1); | 188 | commit = lookup_commit_reference(oid.hash); |
189 | if (!commit || parse_commit(commit)) { | 189 | if (!commit || parse_commit(commit)) { |
190 | cgit_print_error_page(404, "Not found", "Not found"); | 190 | cgit_print_error_page(404, "Not found", "Not found"); |
191 | return; | 191 | return; |