Merge branch 'stable'

This commit is contained in:
Lars Hjemli 2010-02-27 12:53:27 +01:00
commit 71d3ca75d1
2 changed files with 3 additions and 3 deletions

2
cgit.c
View File

@ -260,7 +260,7 @@ char *xstrdupn(const char *str)
static void prepare_context(struct cgit_context *ctx) static void prepare_context(struct cgit_context *ctx)
{ {
memset(ctx, 0, sizeof(ctx)); memset(ctx, 0, sizeof(*ctx));
ctx->cfg.agefile = "info/web/last-modified"; ctx->cfg.agefile = "info/web/last-modified";
ctx->cfg.nocache = 0; ctx->cfg.nocache = 0;
ctx->cfg.cache_size = 0; ctx->cfg.cache_size = 0;

View File

@ -246,7 +246,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
char *delim; char *delim;
delim = repolink(title, class, page, head, path); delim = repolink(title, class, page, head, path);
if (rev && strcmp(rev, ctx.qry.head)) { if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {
html(delim); html(delim);
html("id="); html("id=");
html_url_arg(rev); html_url_arg(rev);
@ -363,7 +363,7 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
char *delim; char *delim;
delim = repolink(title, class, "diff", head, path); delim = repolink(title, class, "diff", head, path);
if (new_rev && strcmp(new_rev, ctx.qry.head)) { if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {
html(delim); html(delim);
html("id="); html("id=");
html_url_arg(new_rev); html_url_arg(new_rev);