crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove trailing slash after remove-suffix

Browse Source 
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>
This commit is contained in:
Lukas Fleischer 2014-12-13 11:40:48 +01:00 committed by Jason A. Donenfeld
parent 17838ec630
commit 485b09925c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scan-tree.c
View File

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