2 files changed, 9 insertions, 10 deletions

diff --git a/cgit.c b/cgit.c
index b270fdc..2c933dc 100644
--- a/cgit.c
+++ b/cgit.c
@@ -74,38 +74,41 @@ char *find_default_branch(struct cgit_repo *repo)
         for_each_branch_ref(find_current_ref, &info);
         if (info.match)
                 return info.req_ref;
         else
                 return info.first_ref;
 }
 
 static void cgit_print_repo_page(struct cacheitem *item)
 {
         char *title, *tmp;
         int show_search;
         unsigned char sha1[20];
+        int nongit = 0;
 
-        if (chdir(ctx.repo->path)) {
-                title = fmt("%s - %s", ctx.cfg.root_title, "Bad request");
+        setenv("GIT_DIR", ctx.repo->path, 1);
+        setup_git_directory_gently(&nongit);
+        if (nongit) {
+                title = fmt("%s - %s", ctx.cfg.root_title, "config error");
+                tmp = fmt("Not a git repository: '%s'", ctx.repo->path);
+                ctx.repo = NULL;
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title, 0);
-                cgit_print_error(fmt("Unable to scan repository: %s",
-                                     strerror(errno)));
+                cgit_print_error(tmp);
                 cgit_print_docend();
                 return;
         }
 
         title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc);
         show_search = 0;
-        setenv("GIT_DIR", ctx.repo->path, 1);
 
         if (!ctx.qry.head) {
                 ctx.qry.head = xstrdup(find_default_branch(ctx.repo));
                 ctx.repo->defbranch = ctx.qry.head;
         }
 
         if (!ctx.qry.head) {
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title, 0);
                 cgit_print_error("Repository seems to be empty");
                 cgit_print_docend();
                 return;
@@ -170,50 +173,46 @@ static void cgit_print_repo_page(struct cacheitem *item)
                 break;
         case CMD_DIFF:
                 cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path);
                 break;
         default:
                 cgit_print_error("Invalid request");
         }
         cgit_print_docend();
 }
 
 static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 {
-        static char buf[PATH_MAX];
         int stdout2;
 
-        getcwd(buf, sizeof(buf));
         item->st.st_mtime = time(NULL);
 
         if (use_cache) {
                 stdout2 = chk_positive(dup(STDOUT_FILENO),
                                        "Preserving STDOUT");
                 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
                 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
         }
 
         if (ctx.repo)
                 cgit_print_repo_page(item);
         else
                 cgit_print_repolist(item);
 
         if (use_cache) {
                 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
                 chk_positive(dup2(stdout2, STDOUT_FILENO),
                              "Restoring original STDOUT");
                 chk_zero(close(stdout2), "Closing temporary STDOUT");
         }
-
-        chdir(buf);
 }
 
 static void cgit_check_cache(struct cacheitem *item)
 {
         int i = 0;
 
  top:
         if (++i > ctx.cfg.max_lock_attempts) {
                 die("cgit_refresh_cache: unable to lock %s: %s",
                     item->name, strerror(errno));
         }
         if (!cache_exist(item)) {
diff --git a/ui-shared.c b/ui-shared.c
index b9f487a..cc1ab8b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -467,25 +467,25 @@ void cgit_print_pageheader(char *title, int show_search)
         static const char *default_info = "This is cgit, a fast webinterface for git repositories";
         int header = 0;
         char *url;
 
         html("<table id='layout' summary=''>\n");
         html("<tr><td id='sidebar'>\n");
         html("<table class='sidebar' cellspacing='0' summary=''>\n");
         html("<tr><td class='sidebar'>\n<a href='");
         html_attr(cgit_rooturl());
         htmlf("'><img src='%s' alt='cgit'/></a>\n",
               ctx.cfg.logo);
         html("</td></tr>\n<tr><td class='sidebar'>\n");
-        if (ctx.qry.repo) {
+        if (ctx.repo) {
                 html("<h1 class='first'>");
                 html_txt(strrpart(ctx.repo->name, 20));
                 html("</h1>\n");
                 html_txt(ctx.repo->desc);
                 if (ctx.repo->owner) {
                         html("<h1>owner</h1>\n");
                         html_txt(ctx.repo->owner);
                 }
                 html("<h1>navigate</h1>\n");
                 reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head,
                             NULL, NULL);
                 cgit_log_link("log", NULL, "menu", ctx.qry.head, NULL, NULL,