diff options
author | Lars Hjemli | 2011-06-18 14:59:51 +0200 |
---|---|---|
committer | Lars Hjemli | 2011-06-18 14:59:51 +0200 |
commit | b0d72da02850abaf4be65ff220774a457c214651 (patch) | |
tree | bbe88fcd609137ecf32877e19a6a7b56441fa4a3 | |
parent | 8729d251a900b2e6e22cc4c93a2193fd8a2b9acf (diff) | |
parent | 9900ac022edfcfacee317d19a0f1d4d03b837b43 (diff) | |
download | cgit-b0d72da02850abaf4be65ff220774a457c214651.tar.gz cgit-b0d72da02850abaf4be65ff220774a457c214651.tar.bz2 cgit-b0d72da02850abaf4be65ff220774a457c214651.zip |
Merge branch 'stable'
-rw-r--r-- | cgit.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -421,13 +421,17 @@ static int prepare_repo_cmd(struct cgit_context *ctx) | |||
421 | char *tmp; | 421 | char *tmp; |
422 | unsigned char sha1[20]; | 422 | unsigned char sha1[20]; |
423 | int nongit = 0; | 423 | int nongit = 0; |
424 | int rc; | ||
424 | 425 | ||
425 | setenv("GIT_DIR", ctx->repo->path, 1); | 426 | setenv("GIT_DIR", ctx->repo->path, 1); |
426 | setup_git_directory_gently(&nongit); | 427 | setup_git_directory_gently(&nongit); |
427 | if (nongit) { | 428 | if (nongit) { |
429 | rc = errno; | ||
428 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 430 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
429 | "config error"); | 431 | "config error"); |
430 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 432 | tmp = fmt("Failed to open %s: %s", |
433 | ctx->repo->name, | ||
434 | rc ? strerror(rc) : "Not a valid git repository"); | ||
431 | ctx->repo = NULL; | 435 | ctx->repo = NULL; |
432 | cgit_print_http_headers(ctx); | 436 | cgit_print_http_headers(ctx); |
433 | cgit_print_docstart(ctx); | 437 | cgit_print_docstart(ctx); |