aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Keeping2018-03-31 15:06:01 +0100
committerJason A. Donenfeld2018-06-27 18:11:19 +0200
commit5b1f42ffeec7e315fc4fcff5145e5b0adca30715 (patch)
tree98bc7c2e0c21f8a3f9229043ffa3888f6144467c
parent82aadcfc51ab9560862b99bfe5833c17f102f0ac (diff)
downloadcgit-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.c8
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)
1115{ 1115{
1116 const struct cgit_snapshot_format* f; 1116 const struct cgit_snapshot_format* f;
1117 struct strbuf filename = STRBUF_INIT; 1117 struct strbuf filename = STRBUF_INIT;
1118 const char *basename;
1118 size_t prefixlen; 1119 size_t prefixlen;
1119 1120
1120 cgit_compose_snapshot_prefix(&filename, cgit_snapshot_prefix(repo), ref); 1121 basename = cgit_snapshot_prefix(repo);
1122 if (starts_with(ref, basename))
1123 strbuf_addstr(&filename, ref);
1124 else
1125 cgit_compose_snapshot_prefix(&filename, basename, ref);
1126
1121 prefixlen = filename.len; 1127 prefixlen = filename.len;
1122 for (f = cgit_snapshot_formats; f->suffix; f++) { 1128 for (f = cgit_snapshot_formats; f->suffix; f++) {
1123 if (!(repo->snapshots & f->bit)) 1129 if (!(repo->snapshots & f->bit))