about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2011-06-18 14:59:51 +0200
committerLars Hjemli <hjemli@gmail.com>2011-06-18 14:59:51 +0200
commitb0d72da02850abaf4be65ff220774a457c214651 (patch)
treebbe88fcd609137ecf32877e19a6a7b56441fa4a3
parentMerge branch 'stable' (diff)
parentcgit.c: improve error message when git repo cannot be accessed (diff)
downloadcgit-pink-b0d72da02850abaf4be65ff220774a457c214651.tar.gz
cgit-pink-b0d72da02850abaf4be65ff220774a457c214651.zip
Merge branch 'stable'
-rw-r--r--cgit.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index 51ca78a..b7807ad 100644
--- a/cgit.c
+++ b/cgit.c
@@ -421,13 +421,17 @@ 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);