Author: Lukas Fleischer <cgit@cryptocrack.de>
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>
scan-tree.c | 9 ++++++---
diff --git a/scan-tree.c b/scan-tree.c index 044bcdcfc4dd6a48df7bb06f0bbdfc40a89a7b70..e900ad9ff009a897f056bb0ceb183bcd37ed6f17 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -123,9 +123,12 @@ git_config_from_file(gitconfig_config, path->buf, NULL); 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) {