author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:32:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:32:48 (UTC) |
commit | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (patch) (unidiff) | |
tree | 432b3dc327e05220c6ac0aff9ca81cf38a47524c /cgit.c | |
parent | 57bb4fdb8419d7c250d4c6146910df3263943951 (diff) | |
parent | 735e15e38a484bf0daa98776fa7cde270a271cda (diff) | |
download | cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.zip cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.gz cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.bz2 |
Merge branch 'ro/ssdiff'
-rw-r--r-- | cgit.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -186,2 +186,4 @@ void config_cb(const char *name, const char *value) | |||
186 | ctx.cfg.summary_tags = atoi(value); | 186 | ctx.cfg.summary_tags = atoi(value); |
187 | else if (!strcmp(name, "side-by-side-diffs")) | ||
188 | ctx.cfg.ssdiff = atoi(value); | ||
187 | else if (!strcmp(name, "agefile")) | 189 | else if (!strcmp(name, "agefile")) |
@@ -244,2 +246,4 @@ static void querystring_cb(const char *name, const char *value) | |||
244 | ctx.qry.period = xstrdup(value); | 246 | ctx.qry.period = xstrdup(value); |
247 | } else if (!strcmp(name, "ss")) { | ||
248 | ctx.qry.ssdiff = atoi(value); | ||
245 | } | 249 | } |
@@ -286,2 +290,3 @@ static void prepare_context(struct cgit_context *ctx) | |||
286 | ctx->cfg.summary_tags = 10; | 290 | ctx->cfg.summary_tags = 10; |
291 | ctx->cfg.ssdiff = 0; | ||
287 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 292 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |