diff options
| author | Lars Hjemli | 2009-12-08 19:32:48 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2009-12-08 19:32:48 +0100 |
| commit | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (patch) | |
| tree | 432b3dc327e05220c6ac0aff9ca81cf38a47524c /cgit.c | |
| parent | 57bb4fdb8419d7c250d4c6146910df3263943951 (diff) | |
| parent | 735e15e38a484bf0daa98776fa7cde270a271cda (diff) | |
| download | cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.gz cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.bz2 cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.zip | |
Merge branch 'ro/ssdiff'
Diffstat (limited to 'cgit.c')
| -rw-r--r-- | cgit.c | 5 |
1 files changed, 5 insertions, 0 deletions
| @@ -184,6 +184,8 @@ void config_cb(const char *name, const char *value) | |||
| 184 | ctx.cfg.summary_branches = atoi(value); | 184 | ctx.cfg.summary_branches = atoi(value); |
| 185 | else if (!strcmp(name, "summary-tags")) | 185 | else if (!strcmp(name, "summary-tags")) |
| 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")) |
| 188 | ctx.cfg.agefile = xstrdup(value); | 190 | ctx.cfg.agefile = xstrdup(value); |
| 189 | else if (!strcmp(name, "renamelimit")) | 191 | else if (!strcmp(name, "renamelimit")) |
| @@ -242,6 +244,8 @@ static void querystring_cb(const char *name, const char *value) | |||
| 242 | ctx.qry.showmsg = atoi(value); | 244 | ctx.qry.showmsg = atoi(value); |
| 243 | } else if (!strcmp(name, "period")) { | 245 | } else if (!strcmp(name, "period")) { |
| 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 | } |
| 246 | } | 250 | } |
| 247 | 251 | ||
| @@ -284,6 +288,7 @@ static void prepare_context(struct cgit_context *ctx) | |||
| 284 | ctx->cfg.summary_branches = 10; | 288 | ctx->cfg.summary_branches = 10; |
| 285 | ctx->cfg.summary_log = 10; | 289 | ctx->cfg.summary_log = 10; |
| 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")); |
| 288 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 293 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
| 289 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 294 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
