diff options
| author | John Keeping <john@keeping.me.uk> | 2018-03-31 15:06:01 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-06-27 18:11:19 +0200 |
| commit | 5b1f42ffeec7e315fc4fcff5145e5b0adca30715 (patch) | |
| tree | 98bc7c2e0c21f8a3f9229043ffa3888f6144467c | |
| parent | 82aadcfc51ab9560862b99bfe5833c17f102f0ac (diff) | |
| download | cgit-5b1f42ffeec7e315fc4fcff5145e5b0adca30715.tar.gz cgit-5b1f42ffeec7e315fc4fcff5145e5b0adca30715.tar.bz2 cgit-5b1f42ffeec7e315fc4fcff5145e5b0adca30715.zip | |
ui-shared: use the same snapshot logic as ui-refs
Make snapshot links in the commit UI use the same prefix algorithm as
those in the summary UI, so that refs starting with the snapshot prefix
are used as-is rather than composed with the prefix repeated.
Signed-off-by: John Keeping <john@keeping.me.uk>
Reviewed-by: Christian Hesse <mail@eworm.de>
| -rw-r--r-- | ui-shared.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 8ae81d2..50a168d 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -1115,9 +1115,15 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref) { const struct cgit_snapshot_format* f; struct strbuf filename = STRBUF_INIT; + const char *basename; size_t prefixlen; - cgit_compose_snapshot_prefix(&filename, cgit_snapshot_prefix(repo), ref); + basename = cgit_snapshot_prefix(repo); + if (starts_with(ref, basename)) + strbuf_addstr(&filename, ref); + else + cgit_compose_snapshot_prefix(&filename, basename, ref); + prefixlen = filename.len; for (f = cgit_snapshot_formats; f->suffix; f++) { if (!(repo->snapshots & f->bit)) |