author | Lars Hjemli <hjemli@gmail.com> | 2011-06-18 12:32:43 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-06-18 12:59:01 (UTC) |
commit | 9900ac022edfcfacee317d19a0f1d4d03b837b43 (patch) (side-by-side diff) | |
tree | 414b80acb0f0d442e08c7e6b276822c7c662cd8b /cgit.c | |
parent | 46ca32e04319caf9dd65f9de47704d637547ad23 (diff) | |
download | cgit-9900ac022edfcfacee317d19a0f1d4d03b837b43.zip cgit-9900ac022edfcfacee317d19a0f1d4d03b837b43.tar.gz cgit-9900ac022edfcfacee317d19a0f1d4d03b837b43.tar.bz2 |
cgit.c: improve error message when git repo cannot be accessed
The current 'Not a git repository' error message is not very helpful,
since it doesn't state the cause of the problem.
This patch uses errno to provide a hint of the underlying problem. It
would have been even better to give the exact cause (e.g. for ENOENT it
would be nice to know which file/directory is missing), but that would
require reimplementing setup_git_directory_gently() which seems a bit
overkill.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -400,19 +400,23 @@ char *find_default_branch(struct cgit_repo *repo) static int prepare_repo_cmd(struct cgit_context *ctx) { char *tmp; unsigned char sha1[20]; int nongit = 0; + int rc; setenv("GIT_DIR", ctx->repo->path, 1); setup_git_directory_gently(&nongit); if (nongit) { + rc = errno; ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, "config error"); - tmp = fmt("Not a git repository: '%s'", ctx->repo->path); + tmp = fmt("Failed to open %s: %s", + ctx->repo->name, + rc ? strerror(rc) : "Not a valid git repository"); ctx->repo = NULL; cgit_print_http_headers(ctx); cgit_print_docstart(ctx); cgit_print_pageheader(ctx); cgit_print_error(tmp); cgit_print_docend(); |