summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorLars Hjemli <hjemli@gmail.com>2008-04-28 23:13:08 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-28 23:13:08 (UTC)
commit905dbaef5aa33ea11d385b82de0188fee73dd655 (patch) (unidiff)
tree34712da2eef917be04b2acc5585612b65c1e49cc /cgit.c
parentd188ed4f2905e6d10abd26c45572a0d48eb53969 (diff)
parent71adba1f1678914063fc109cf3805afde2c68f75 (diff)
downloadcgit-905dbaef5aa33ea11d385b82de0188fee73dd655.zip
cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.gz
cgit-905dbaef5aa33ea11d385b82de0188fee73dd655.tar.bz2
Merge branch 'lh/about'
* lh/about: Add 'about site' and 'about repo' pages Prepare for 'about site' page / add 'root-readme' option to cgitrc Make it possible for a single cmd to work both with and without a repo Re-enable 'index-info' and add support for 'root-desc' in cgitrc Move included header-file out of repolist table Prepare for 'about repo' page
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index 38b0ba5..a402758 100644
--- a/cgit.c
+++ b/cgit.c
@@ -21,2 +21,6 @@ void config_cb(const char *name, const char *value)
21 ctx.cfg.root_title = xstrdup(value); 21 ctx.cfg.root_title = xstrdup(value);
22 else if (!strcmp(name, "root-desc"))
23 ctx.cfg.root_desc = xstrdup(value);
24 else if (!strcmp(name, "root-readme"))
25 ctx.cfg.root_readme = xstrdup(value);
22 else if (!strcmp(name, "css")) 26 else if (!strcmp(name, "css"))
@@ -161,2 +165,3 @@ static void prepare_context(struct cgit_context *ctx)
161 ctx->cfg.root_title = "Git repository browser"; 165 ctx->cfg.root_title = "Git repository browser";
166 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
162 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 167 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
@@ -306,3 +311,12 @@ static void process_request(struct cgit_context *ctx)
306 311
307 if (cmd->want_repo && prepare_repo_cmd(ctx)) 312 if (cmd->want_repo && !ctx->repo) {
313 cgit_print_http_headers(ctx);
314 cgit_print_docstart(ctx);
315 cgit_print_pageheader(ctx);
316 cgit_print_error(fmt("No repository selected"));
317 cgit_print_docend();
318 return;
319 }
320
321 if (ctx->repo && prepare_repo_cmd(ctx))
308 return; 322 return;