4 files changed, 13 insertions, 0 deletions

diff --git a/cgit.c b/cgit.c
index 2364d1c..f9a42bb 100644
--- a/cgit.c
+++ b/cgit.c
@@ -206,4 +206,6 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "renamelimit"))
                 ctx.cfg.renamelimit = atoi(value);
+        else if (!strcmp(name, "remove-suffix"))
+                ctx.cfg.remove_suffix = atoi(value);
         else if (!strcmp(name, "robots"))
                 ctx.cfg.robots = xstrdup(value);
@@ -303,4 +305,5 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.project_list = NULL;
         ctx->cfg.renamelimit = -1;
+        ctx->cfg.remove_suffix = 0;
         ctx->cfg.robots = "index, nofollow";
         ctx->cfg.root_title = "Git repository browser";
diff --git a/cgit.h b/cgit.h
index 4591f8c..ada8535 100644
--- a/cgit.h
+++ b/cgit.h
@@ -203,4 +203,5 @@ struct cgit_config {
         int noheader;
         int renamelimit;
+        int remove_suffix;
         int snapshots;
         int summary_branches;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index ec004d4..6fb1083 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -230,4 +230,9 @@ project-list::
         scan-path. Default value: none. See also: scan-path.
 
+remove-suffix::
+        If set to "1" and scan-path is enabled, if any repositories are found
+        with a suffix of ".git", this suffix will be removed for the url and
+        name. Default value: "0". See also: scan-path.
+
 renamelimit::
         Maximum number of files to consider when detecting renames. The value
@@ -539,2 +544,3 @@ AUTHOR
 ------
 Lars Hjemli <hjemli@gmail.com>
+Jason A. Donenfeld <Jason@zx2c4.com>
diff --git a/scan-tree.c b/scan-tree.c
index 9bf9b38..a83a78c 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -82,4 +82,7 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 
         repo = cgit_add_repo(xstrdup(p));
+        if (ctx.cfg.remove_suffix)
+                if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
+                        *p = '\0';
         repo->name = repo->url;
         repo->path = xstrdup(path);