List for cgit developers and users
 help / color / mirror / Atom feed
From: list at eworm.de (Christian Hesse)
Subject: [PATCH 07/10] ui-shared: replace 'unsigned char sha1[20]' with 'struct object_id oid'
Date: Tue,  4 Oct 2016 09:52:00 +0200	[thread overview]
Message-ID: <20161004075203.22115-7-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-shared.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui-shared.c b/ui-shared.c
index 3fa36d6..2e4fcd9 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1074,18 +1074,18 @@ void cgit_print_filemode(unsigned short mode)
 void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base,
 				  const char *ref)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 
 	/*
 	 * Prettify snapshot names by stripping leading "v" or "V" if the tag
 	 * name starts with {v,V}[0-9] and the prettify mapping is injective,
 	 * i.e. each stripped tag can be inverted without ambiguities.
 	 */
-	if (get_sha1(fmt("refs/tags/%s", ref), sha1) == 0 &&
+	if (get_oid(fmt("refs/tags/%s", ref), &oid) == 0 &&
 	    (ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]) &&
-	    ((get_sha1(fmt("refs/tags/%s", ref + 1), sha1) == 0) +
-	     (get_sha1(fmt("refs/tags/v%s", ref + 1), sha1) == 0) +
-	     (get_sha1(fmt("refs/tags/V%s", ref + 1), sha1) == 0) == 1))
+	    ((get_oid(fmt("refs/tags/%s", ref + 1), &oid) == 0) +
+	     (get_oid(fmt("refs/tags/v%s", ref + 1), &oid) == 0) +
+	     (get_oid(fmt("refs/tags/V%s", ref + 1), &oid) == 0) == 1))
 		ref++;
 
 	strbuf_addf(filename, "%s-%s", base, ref);
-- 
2.10.0



  parent reply	other threads:[~2016-10-04  7:52 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   ` [PATCH 06/10] ui-plain: " list
2016-10-04  7:52   ` list [this message]
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-7-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).