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>

1 files changed, 6 insertions, 3 deletions

diff --git a/scan-tree.c b/scan-tree.c
index 044bcdc..e900ad9 100644
--- a/scan-tree.c
+++ b/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);
         }
 
-        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) {