diff options
| author |   Richard Maw <richard.maw@gmail.com> | 2016-06-25 20:23:51 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@gmail.com> | 2016-07-13 20:09:37 +0100 |
| commit | b2ac89127af9dde5c3addbd3e00eedd9f498cfab (patch) | |
| tree | 53af9f14fbf96f1759c1b0e04e789bfb1326d2c4 /ui-shared.c | |
| parent | Fix archive generation (diff) | |
| download | cgit-b2ac89127af9dde5c3addbd3e00eedd9f498cfab.tar.xz cgit-b2ac89127af9dde5c3addbd3e00eedd9f498cfab.zip | |
Add a wrapper for get_sha1 called cgit_get_sha1
This will later be changed to include namespace resolution,
but the call sites are changed now to keep the changes small.
Signed-off-by: Richard Maw <richard.maw@gmail.com>
Diffstat (limited to 'ui-shared.c')
| -rw-r--r-- | ui-shared.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c index e39d004..ca40d42 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -1079,11 +1079,11 @@ void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base, * 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 (cgit_get_sha1(fmt("refs/tags/%s", ref), sha1) == 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)) + ((cgit_get_sha1(fmt("refs/tags/%s", ref + 1), sha1) == 0) + + (cgit_get_sha1(fmt("refs/tags/v%s", ref + 1), sha1) == 0) + + (cgit_get_sha1(fmt("refs/tags/V%s", ref + 1), sha1) == 0) == 1)) ref++; strbuf_addf(filename, "%s-%s", base, ref); |