-rw-r--r-- | ui-snapshot.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 6e3412c..07cc944 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -106,39 +106,37 @@ static int make_snapshot(const struct cgit_snapshot_format *format, | |||
106 | * Otherwise, if the snapshot name has a prefix matching the result from | 106 | * Otherwise, if the snapshot name has a prefix matching the result from |
107 | * repo_basename(), we strip the basename and any following '-' and '_' | 107 | * repo_basename(), we strip the basename and any following '-' and '_' |
108 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once | 108 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once |
109 | * more. If this still isn't a valid commit object name, we check if pre- | 109 | * more. If this still isn't a valid commit object name, we check if pre- |
110 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives | 110 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives |
111 | * us something valid. | 111 | * us something valid. |
112 | */ | 112 | */ |
113 | static const char *get_ref_from_filename(const char *url, const char *filename, | 113 | static const char *get_ref_from_filename(const char *url, const char *filename, |
114 | const struct cgit_snapshot_format *format) | 114 | const struct cgit_snapshot_format *format) |
115 | { | 115 | { |
116 | const char *reponame; | 116 | const char *reponame; |
117 | unsigned char sha1[20]; | 117 | unsigned char sha1[20]; |
118 | char *snapshot; | 118 | char *snapshot; |
119 | 119 | ||
120 | snapshot = xstrdup(filename); | 120 | snapshot = xstrdup(filename); |
121 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; | 121 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; |
122 | fprintf(stderr, "snapshot=%s\n", snapshot); | ||
123 | 122 | ||
124 | if (get_sha1(snapshot, sha1) == 0) | 123 | if (get_sha1(snapshot, sha1) == 0) |
125 | return snapshot; | 124 | return snapshot; |
126 | 125 | ||
127 | reponame = cgit_repobasename(url); | 126 | reponame = cgit_repobasename(url); |
128 | fprintf(stderr, "reponame=%s\n", reponame); | ||
129 | if (prefixcmp(snapshot, reponame) == 0) { | 127 | if (prefixcmp(snapshot, reponame) == 0) { |
130 | snapshot += strlen(reponame); | 128 | snapshot += strlen(reponame); |
131 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) | 129 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) |
132 | snapshot++; | 130 | snapshot++; |
133 | } | 131 | } |
134 | 132 | ||
135 | if (get_sha1(snapshot, sha1) == 0) | 133 | if (get_sha1(snapshot, sha1) == 0) |
136 | return snapshot; | 134 | return snapshot; |
137 | 135 | ||
138 | snapshot = fmt("v%s", snapshot); | 136 | snapshot = fmt("v%s", snapshot); |
139 | if (get_sha1(snapshot, sha1) == 0) | 137 | if (get_sha1(snapshot, sha1) == 0) |
140 | return snapshot; | 138 | return snapshot; |
141 | 139 | ||
142 | return NULL; | 140 | return NULL; |
143 | } | 141 | } |
144 | 142 | ||