ui-repolist.c: fallback to "master" if no default branch is specified

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 3ef2e99deb18c3cff37a76d59dbc1f157671d666..f21d28d5bc5b5f41207530bd5111553377735cc0 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,12 +6,6 @@
  *   (see COPYING for full license text)
  */
 
-/* This is needed for strcasestr to be defined by <string.h> */
-#define _GNU_SOURCE 1
-#include <string.h>
-
-#include <time.h>
-
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
@@ -26,7 +20,7 @@ time_t read_agefile(char *path)
        if (readfile(path, &buf, &size))
                return -1;
 
-       if (parse_date(buf, buf2, sizeof(buf2)))
+       if (parse_date(buf, buf2, sizeof(buf2)) > 0)
                result = strtoul(buf2, NULL, 10);
        else
                result = 0;
@@ -51,12 +45,22 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
                return 1;
        }
 
-       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-       if (stat(path, &s) == 0)
+       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
+                  repo->defbranch : "master");
+       if (stat(path, &s) == 0) {
                *mtime = s.st_mtime;
-       else
-               *mtime = 0;
+               r->mtime = *mtime;
+               return 1;
+       }
+
+       path = fmt("%s/%s", repo->path, "packed-refs");
+       if (stat(path, &s) == 0) {
+               *mtime = s.st_mtime;
+               r->mtime = *mtime;
+               return 1;
+       }
 
+       *mtime = 0;
        r->mtime = *mtime;
        return (r->mtime != 0);
 }
@@ -94,7 +98,7 @@ int is_in_url(struct cgit_repo *repo)
 
 void print_sort_header(const char *title, const char *sort)
 {
-       htmlf("<th class='left'><a href='./?s=%s", sort);
+       htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
        if (ctx.qry.search) {
                html("&q=");
                html_url_arg(ctx.qry.search);