Merge branch 'stable'

diff --git a/cgit.c b/cgit.c
index e498030b4dd7d83043cadb1a57ce12000b949755..eb964ac082f3be22305915040269c57715e0a88d 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -147,6 +147,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.enable_filter_overrides = atoi(value);
        else if (!strcmp(name, "enable-gitweb-owner"))
                ctx.cfg.enable_gitweb_owner = atoi(value);
+       else if (!strcmp(name, "enable-http-clone"))
+               ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
                ctx.cfg.enable_index_links = atoi(value);
        else if (!strcmp(name, "enable-commit-graph"))
@@ -312,6 +314,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.logo = "/cgit.png";
        ctx->cfg.local_time = 0;
        ctx->cfg.enable_gitweb_owner = 1;
+       ctx->cfg.enable_http_clone = 1;
        ctx->cfg.enable_tree_linenumbers = 1;
        ctx->cfg.max_repo_count = 50;
        ctx->cfg.max_commit_count = 50;
@@ -439,7 +442,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
                tmp = xstrdup(ctx->qry.head);
                ctx->qry.head = ctx->repo->defbranch;
                ctx->page.status = 404;
-               ctx->page.statusmsg = "not found";
+               ctx->page.statusmsg = "Not found";
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
@@ -458,6 +461,8 @@ static void process_request(void *cbdata)
        cmd = cgit_get_cmd(ctx);
        if (!cmd) {
                ctx->page.title = "cgit error";
+               ctx->page.status = 404;
+               ctx->page.statusmsg = "Not found";
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
@@ -466,6 +471,11 @@ static void process_request(void *cbdata)
                return;
        }
 
+       if (!ctx->cfg.enable_http_clone && cmd->is_clone) {
+               html_status(404, "Not found", 0);
+               return;
+       }
+
        /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
         * in-project path limit to be made available at ctx->qry.vpath.
         * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).

diff --git a/cgit.h b/cgit.h
index b5f00fc9c1c1d6d6e7f7a8cdc2695cab334752ab..ecae4537a6b3cfc72d78e33026c9a053b65b69f4 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -191,6 +191,7 @@ struct cgit_config {
        int embedded;
        int enable_filter_overrides;
        int enable_gitweb_owner;
+       int enable_http_clone;
        int enable_index_links;
        int enable_commit_graph;
        int enable_log_filecount;

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 65b210f3cfb49aae3825fc563c2176c88c160e22..875d51f8847519da360b66ff3f1e63e400fc4d24 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -105,6 +105,11 @@ enable-gitweb-owner::
        for the git config value "gitweb.owner" to determine the owner.
        Default value: "1". See also: scan-path.
 
+enable-http-clone::
+       If set to "1", cgit will act as an dumb HTTP endpoint for git clones.
+       If you use an alternate way of serving git repositories, you may wish
+       to disable this. Default value: "1".
+
 enable-index-links::
        Flag which, when set to "1", will make cgit generate extra links for
        each repo in the repository index (specifically, to the "summary",

diff --git a/cmd.c b/cmd.c
index 536515b7bb135dafefc5b5ed4e55c0dc7d2eb98a..d114eb3fd6dc46a49d2180304b394e3423a430a7 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -130,31 +130,31 @@ static void tree_fn(struct cgit_context *ctx)
        cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
 }
 
-#define def_cmd(name, want_repo, want_layout, want_vpath) \
-       {#name, name##_fn, want_repo, want_layout, want_vpath}
+#define def_cmd(name, want_repo, want_layout, want_vpath, is_clone) \
+       {#name, name##_fn, want_repo, want_layout, want_vpath, is_clone}
 
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
        static struct cgit_cmd cmds[] = {
-               def_cmd(HEAD, 1, 0, 0),
-               def_cmd(atom, 1, 0, 0),
-               def_cmd(about, 0, 1, 0),
-               def_cmd(blob, 1, 0, 0),
-               def_cmd(commit, 1, 1, 1),
-               def_cmd(diff, 1, 1, 1),
-               def_cmd(info, 1, 0, 0),
-               def_cmd(log, 1, 1, 1),
-               def_cmd(ls_cache, 0, 0, 0),
-               def_cmd(objects, 1, 0, 0),
-               def_cmd(patch, 1, 0, 1),
-               def_cmd(plain, 1, 0, 0),
-               def_cmd(refs, 1, 1, 0),
-               def_cmd(repolist, 0, 0, 0),
-               def_cmd(snapshot, 1, 0, 0),
-               def_cmd(stats, 1, 1, 1),
-               def_cmd(summary, 1, 1, 0),
-               def_cmd(tag, 1, 1, 0),
-               def_cmd(tree, 1, 1, 1),
+               def_cmd(HEAD, 1, 0, 0, 1),
+               def_cmd(atom, 1, 0, 0, 0),
+               def_cmd(about, 0, 1, 0, 0),
+               def_cmd(blob, 1, 0, 0, 0),
+               def_cmd(commit, 1, 1, 1, 0),
+               def_cmd(diff, 1, 1, 1, 0),
+               def_cmd(info, 1, 0, 0, 1),
+               def_cmd(log, 1, 1, 1, 0),
+               def_cmd(ls_cache, 0, 0, 0, 0),
+               def_cmd(objects, 1, 0, 0, 1),
+               def_cmd(patch, 1, 0, 1, 0),
+               def_cmd(plain, 1, 0, 0, 0),
+               def_cmd(refs, 1, 1, 0, 0),
+               def_cmd(repolist, 0, 0, 0, 0),
+               def_cmd(snapshot, 1, 0, 0, 0),
+               def_cmd(stats, 1, 1, 1, 0),
+               def_cmd(summary, 1, 1, 0, 0),
+               def_cmd(tag, 1, 1, 0, 0),
+               def_cmd(tree, 1, 1, 1, 0),
        };
        int i;
 

diff --git a/cmd.h b/cmd.h
index 8dc01bd32b6c22d3426310a916ff5dabd2f0aa88..eb5bc87feda8a62672b31a268e109d89417557e5 100644 (file)
--- a/cmd.h
+++ b/cmd.h
@@ -8,7 +8,8 @@ struct cgit_cmd {
        cgit_cmd_fn fn;
        unsigned int want_repo:1,
                want_layout:1,
-               want_vpath:1;
+               want_vpath:1,
+               is_clone:1;
 };
 
 extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx);

diff --git a/ui-log.c b/ui-log.c
index 8add66aa0f41c16081a2ead29ba2c19a8f41ace5..2e6e9d66125064c3737954ef7420240c28d26eeb 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -100,11 +100,10 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        struct strbuf graphbuf = STRBUF_INIT;
        struct strbuf msgbuf = STRBUF_INIT;
 
-       if (ctx.repo->enable_log_filecount) {
+       if (ctx.repo->enable_log_filecount)
+               cols++;
+       if (ctx.repo->enable_log_linecount)
                cols++;
-               if (ctx.repo->enable_log_linecount)
-                       cols++;
-       }
 
        if (revs->graph) {
                /* Advance graph until current commit */
@@ -179,18 +178,18 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                html_link_close();
        }
 
-       if (ctx.repo->enable_log_filecount) {
+       if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {
                files = 0;
                add_lines = 0;
                rem_lines = 0;
                cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
-               html("</td><td>");
-               htmlf("%d", files);
-               if (ctx.repo->enable_log_linecount) {
-                       html("</td><td>");
-                       htmlf("-%d/+%d", rem_lines, add_lines);
-               }
        }
+
+       if (ctx.repo->enable_log_filecount)
+               htmlf("</td><td>%d", files);
+       if (ctx.repo->enable_log_linecount)
+               htmlf("</td><td>-%d/+%d", rem_lines, add_lines);
+
        html("</td></tr>\n");
 
        if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
@@ -379,10 +378,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (ctx.repo->enable_log_filecount) {
                html("<th class='left'>Files</th>");
                columns++;
-               if (ctx.repo->enable_log_linecount) {
-                       html("<th class='left'>Lines</th>");
-                       columns++;
-               }
+       }
+       if (ctx.repo->enable_log_linecount) {
+               html("<th class='left'>Lines</th>");
+               columns++;
        }
        html("</tr>\n");