From: list at eworm.de (Christian Hesse)
Subject: [PATCH 06/10] ui-plain: replace 'unsigned char sha1[20]' with 'struct object_id oid'
Date: Tue, 4 Oct 2016 09:51:59 +0200 [thread overview]
Message-ID: <20161004075203.22115-6-list@eworm.de> (raw)
In-Reply-To: <20161004075203.22115-1-list@eworm.de>
From: Christian Hesse <mail at eworm.de>
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...
Signed-off-by: Christian Hesse <mail at eworm.de>
---
ui-plain.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui-plain.c b/ui-plain.c
index 97cf639..8d541e3 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -164,7 +164,7 @@ static int basedir_len(const char *path)
void cgit_print_plain(void)
{
const char *rev = ctx.qry.sha1;
- unsigned char sha1[20];
+ struct object_id oid;
struct commit *commit;
struct pathspec_item path_items = {
.match = ctx.qry.path,
@@ -181,11 +181,11 @@ void cgit_print_plain(void)
if (!rev)
rev = ctx.qry.head;
- if (get_sha1(rev, sha1)) {
+ if (get_oid(rev, &oid)) {
cgit_print_error_page(404, "Not found", "Not found");
return;
}
- commit = lookup_commit_reference(sha1);
+ commit = lookup_commit_reference(oid.hash);
if (!commit || parse_commit(commit)) {
cgit_print_error_page(404, "Not found", "Not found");
return;
--
2.10.0
next prev parent reply other threads:[~2016-10-04 7:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20161004095050.29c7859b@leda.localdomain>
2016-10-04 7:51 ` [PATCH 01/10] cgit: " list
2016-10-04 7:51 ` [PATCH 02/10] ui-blob: " list
2016-10-04 8:07 ` Jason
2016-10-04 8:19 ` list
2016-10-04 18:34 ` john
2016-10-04 19:24 ` Jason
2016-10-04 19:48 ` list
2016-10-04 7:51 ` [PATCH 03/10] ui-commit: " list
2016-10-04 7:51 ` [PATCH 04/10] ui-log: replace get_sha1() with get_oid() list
2016-10-04 7:51 ` [PATCH 05/10] ui-patch: replace 'unsigned char sha1[20]' with 'struct object_id oid' list
2016-10-04 7:51 ` list [this message]
2016-10-04 7:52 ` [PATCH 07/10] ui-shared: " list
2016-10-04 7:52 ` [PATCH 08/10] ui-snapshot: " list
2016-10-04 7:52 ` [PATCH 09/10] ui-tag: " list
2016-10-04 7:52 ` [PATCH 10/10] ui-tree: " list
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161004075203.22115-6-list@eworm.de \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).