summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-09 11:39:44 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-09 11:39:44 (UTC)
commit97b3d252629a8a3b9d356c2532dec7611438e4b9 (patch) (side-by-side diff)
treeaa8225159ce897830f12b3f2f73f4af12f0d4f8e
parente976df27952ca1e450c1c3d420532ac9f5e3036b (diff)
downloadcgit-97b3d252629a8a3b9d356c2532dec7611438e4b9.zip
cgit-97b3d252629a8a3b9d356c2532dec7611438e4b9.tar.gz
cgit-97b3d252629a8a3b9d356c2532dec7611438e4b9.tar.bz2
cgit.c: allow repo.*-filter options to unset the current default
If e.g. repo.commit-filter is specified as an empty string, this is now properly handled as disabling the global commit-filter setting for the current repository. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index fd341b8..b3a98c1 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,48 +1,48 @@
/* cgit.c: cgi for the git scm
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
#include "cache.h"
#include "cmd.h"
#include "configfile.h"
#include "html.h"
#include "ui-shared.h"
#include "ui-stats.h"
#include "scan-tree.h"
const char *cgit_version = CGIT_VERSION;
struct cgit_filter *new_filter(const char *cmd, int extra_args)
{
struct cgit_filter *f;
- if (!cmd)
+ if (!cmd || !cmd[0])
return NULL;
f = xmalloc(sizeof(struct cgit_filter));
f->cmd = xstrdup(cmd);
f->argv = xmalloc((2 + extra_args) * sizeof(char *));
f->argv[0] = f->cmd;
f->argv[1] = NULL;
return f;
}
void config_cb(const char *name, const char *value)
{
if (!strcmp(name, "root-title"))
ctx.cfg.root_title = xstrdup(value);
else if (!strcmp(name, "root-desc"))
ctx.cfg.root_desc = xstrdup(value);
else if (!strcmp(name, "root-readme"))
ctx.cfg.root_readme = xstrdup(value);
else if (!strcmp(name, "css"))
ctx.cfg.css = xstrdup(value);
else if (!strcmp(name, "favicon"))
ctx.cfg.favicon = xstrdup(value);
else if (!strcmp(name, "footer"))
ctx.cfg.footer = xstrdup(value);