about summary refs log tree commit diff
path: root/cgit.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-12-08 19:32:48 +0100
committerLars Hjemli <hjemli@gmail.com>2009-12-08 19:32:48 +0100
commitf4f6210b4f9c214dc247567bbd06b1135c9ecd06 (patch)
tree432b3dc327e05220c6ac0aff9ca81cf38a47524c /cgit.c
parentMerge branch 'master' of http://op-co.de/cgit (diff)
parentIn side-by-side diff, add support for marking individual characters. (diff)
downloadcgit-pink-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.gz
cgit-pink-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.zip
Merge branch 'ro/ssdiff'
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 08cb5d2..4f68a4b 100644
--- a/cgit.c
+++ b/cgit.c
@@ -184,6 +184,8 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.summary_branches = atoi(value);
 	else if (!strcmp(name, "summary-tags"))
 		ctx.cfg.summary_tags = atoi(value);
+	else if (!strcmp(name, "side-by-side-diffs"))
+		ctx.cfg.ssdiff = atoi(value);
 	else if (!strcmp(name, "agefile"))
 		ctx.cfg.agefile = xstrdup(value);
 	else if (!strcmp(name, "renamelimit"))
@@ -242,6 +244,8 @@ static void querystring_cb(const char *name, const char *value)
 		ctx.qry.showmsg = atoi(value);
 	} else if (!strcmp(name, "period")) {
 		ctx.qry.period = xstrdup(value);
+	} else if (!strcmp(name, "ss")) {
+		ctx.qry.ssdiff = atoi(value);
 	}
 }
 
@@ -284,6 +288,7 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.summary_branches = 10;
 	ctx->cfg.summary_log = 10;
 	ctx->cfg.summary_tags = 10;
+	ctx->cfg.ssdiff = 0;
 	ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
 	ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
 	ctx->env.https = xstrdupn(getenv("HTTPS"));