Remove trailing slash after remove-suffix

When removing the ".git" suffix of a non-bare repository, also remove
the trailing slash for compatibility with cgit_repobasename().

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
upstream
Lukas Fleischer 10 years ago committed by Jason A. Donenfeld
parent 17838ec630
commit 485b09925c
  1. 9
      scan-tree.c

@ -123,9 +123,12 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
strbuf_setlen(path, pathlen); strbuf_setlen(path, pathlen);
} }
if (ctx.cfg.remove_suffix) if (ctx.cfg.remove_suffix) {
if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) size_t urllen;
*p = '\0'; strip_suffix(repo->url, ".git", &urllen);
strip_suffix_mem(repo->url, &urllen, "/");
repo->url[urllen] = '\0';
}
repo->path = xstrdup(path->buf); repo->path = xstrdup(path->buf);
while (!repo->owner) { while (!repo->owner) {
if ((pwd = getpwuid(st.st_uid)) == NULL) { if ((pwd = getpwuid(st.st_uid)) == NULL) {

Loading…
Cancel
Save