20 files changed, 393 insertions, 227 deletions

diff --git a/Makefile b/Makefile
index 538a9f8..eac24ad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CGIT_VERSION = v0.9.0.1
+CGIT_VERSION = v0.9.0.3
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@ -13,7 +13,7 @@ pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.7.4
-GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+GIT_URL = http://hjemli.net/git/git/snapshot/git-$(GIT_VER).tar.bz2
 INSTALL = install
 MAN5_TXT = $(wildcard *.5.txt)
 MAN_TXT  = $(MAN5_TXT)
diff --git a/cgit.c b/cgit.c
index abb698b..b9b3a66 100644
--- a/cgit.c
+++ b/cgit.c
@@ -60,6 +60,8 @@ static void process_cached_repolist(const char *path);
 
 void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 {
+        struct string_list_item *item;
+
         if (!strcmp(name, "name"))
                 repo->name = xstrdup(value);
         else if (!strcmp(name, "clone-url"))
@@ -86,7 +88,10 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                 repo->max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "module-link"))
                 repo->module_link= xstrdup(value);
-        else if (!strcmp(name, "section"))
+        else if (!prefixcmp(name, "module-link.")) {
+                item = string_list_append(&repo->submodules, name + 12);
+                item->util = xstrdup(value);
+        } else if (!strcmp(name, "section"))
                 repo->section = xstrdup(value);
         else if (!strcmp(name, "readme") && value != NULL)
                 repo->readme = xstrdup(value);
@@ -300,6 +305,7 @@ static void querystring_cb(const char *name, const char *value)
                 ctx.qry.period = xstrdup(value);
         } else if (!strcmp(name, "ss")) {
                 ctx.qry.ssdiff = atoi(value);
+                ctx.qry.has_ssdiff = 1;
         } else if (!strcmp(name, "all")) {
                 ctx.qry.show_all = atoi(value);
         } else if (!strcmp(name, "context")) {
@@ -340,7 +346,6 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.max_repodesc_len = 80;
         ctx->cfg.max_blob_size = 0;
         ctx->cfg.max_stats = 0;
-        ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
         ctx->cfg.project_list = NULL;
         ctx->cfg.renamelimit = -1;
         ctx->cfg.remove_suffix = 0;
@@ -418,6 +423,17 @@ char *find_default_branch(struct cgit_repo *repo)
         return ref;
 }
 
+static char *guess_defbranch(const char *repo_path)
+{
+        const char *ref;
+        unsigned char sha1[20];
+
+        ref = resolve_ref("HEAD", sha1, 0, NULL);
+        if (!ref || prefixcmp(ref, "refs/heads/"))
+                return "master";
+        return xstrdup(ref + 11);
+}
+
 static int prepare_repo_cmd(struct cgit_context *ctx)
 {
         char *tmp;
@@ -444,10 +460,12 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
         }
         ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
 
+        if (!ctx->repo->defbranch)
+                ctx->repo->defbranch = guess_defbranch(ctx->repo->path);
+
         if (!ctx->qry.head) {
                 ctx->qry.nohead = 1;
                 ctx->qry.head = find_default_branch(ctx->repo);
-                ctx->repo->defbranch = ctx->qry.head;
         }
 
         if (!ctx->qry.head) {
@@ -471,6 +489,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
                 cgit_print_docend();
                 return 1;
         }
+        sort_string_list(&ctx->repo->submodules);
         cgit_prepare_repo_env(ctx->repo);
         return 0;
 }
diff --git a/cgit.css b/cgit.css
index 55afa94..e06c261 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,4 +1,4 @@
-body, table, form {
+body, div#cgit table, div#cgit form {
         padding: 0em;
         margin: 0em;
 }
@@ -11,39 +11,40 @@ body {
         padding: 4px;
 }
 
-a {
+div#cgit a {
         color: blue;
         text-decoration: none;
 }
 
-a:hover {
+div#cgit a:hover {
         text-decoration: underline;
 }
 
-table {
+div#cgit table {
       border-collapse: collapse;
 }
 
-table#header {
+div#cgit table#header {
         width: 100%;
         margin-bottom: 1em;
 }
 
-table#header td.logo {
+div#cgit table#header td.logo {
         width: 96px;
+        vertical-align: top;
 }
 
-table#header td.main {
+div#cgit table#header td.main {
         font-size: 250%;
         padding-left: 10px;
         white-space: nowrap;
 }
 
-table#header td.main a {
+div#cgit table#header td.main a {
         color: #000;
 }
 
-table#header td.form {
+div#cgit table#header td.form {
         text-align: right;
         vertical-align: bottom;
         padding-right: 1em;
@@ -51,19 +52,19 @@ table#header td.form {
         white-space: nowrap;
 }
 
-table#header td.form form,
-table#header td.form input,
-table#header td.form select {
+div#cgit table#header td.form form,
+div#cgit table#header td.form input,
+div#cgit table#header td.form select {
         font-size: 90%;
 }
 
-table#header td.sub {
+div#cgit table#header td.sub {
         color: #777;
         border-top: solid 1px #ccc;
         padding-left: 10px;
 }
 
-table.tabs {
+div#cgit table.tabs {
         border-bottom: solid 3px #ccc;
         border-collapse: collapse;
         margin-top: 2em;
@@ -71,74 +72,74 @@ table.tabs {
         width: 100%;
 }
 
-table.tabs td {
+div#cgit table.tabs td {
         padding: 0px 1em;
         vertical-align: bottom;
 }
 
-table.tabs td a {
+div#cgit table.tabs td a {
         padding: 2px 0.75em;
         color: #777;
         font-size: 110%;
 }
 
-table.tabs td a.active {
+div#cgit table.tabs td a.active {
         color: #000;
         background-color: #ccc;
 }
 
-table.tabs td.form {
+div#cgit table.tabs td.form {
         text-align: right;
 }
 
-table.tabs td.form form {
+div#cgit table.tabs td.form form {
         padding-bottom: 2px;
         font-size: 90%;
         white-space: nowrap;
 }
 
-table.tabs td.form input,
-table.tabs td.form select {
+div#cgit table.tabs td.form input,
+div#cgit table.tabs td.form select {
         font-size: 90%;
 }
 
-div.path {
+div#cgit div.path {
         margin: 0px;
         padding: 5px 2em 2px 2em;
         color: #000;
         background-color: #eee;
 }
 
-div.content {
+div#cgit div.content {
         margin: 0px;
         padding: 2em;
         border-bottom: solid 3px #ccc;
 }
 
 
-table.list {
+div#cgit table.list {
         width: 100%;
         border: none;
         border-collapse: collapse;
 }
 
-table.list tr {
+div#cgit table.list tr {
         background: white;
 }
 
-table.list tr.logheader {
+div#cgit table.list tr.logheader {
         background: #eee;
 }
 
-table.list tr:hover {
+div#cgit table.list tr:hover {
         background: #eee;
 }
 
-table.list tr.nohover:hover {
+div#cgit table.list tr.nohover:hover {
         background: white;
 }
 
-table.list th {
+div#cgit table.list th {
         font-weight: bold;
         /* color: #888;
         border-top: dashed 1px #888;
@@ -148,93 +149,93 @@ table.list th {
         vertical-align: baseline;
 }
 
-table.list td {
+div#cgit table.list td {
         border: none;
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
-table.list td.commitgraph {
+div#cgit table.list td.commitgraph {
         font-family: monospace;
         white-space: pre;
 }
 
-table.list td.commitgraph .column1 {
+div#cgit table.list td.commitgraph .column1 {
         color: #a00;
 }
 
-table.list td.commitgraph .column2 {
+div#cgit table.list td.commitgraph .column2 {
         color: #0a0;
 }
 
-table.list td.commitgraph .column3 {
+div#cgit table.list td.commitgraph .column3 {
         color: #aa0;
 }
 
-table.list td.commitgraph .column4 {
+div#cgit table.list td.commitgraph .column4 {
         color: #00a;
 }
 
-table.list td.commitgraph .column5 {
+div#cgit table.list td.commitgraph .column5 {
         color: #a0a;
 }
 
-table.list td.commitgraph .column6 {
+div#cgit table.list td.commitgraph .column6 {
         color: #0aa;
 }
 
-table.list td.logsubject {
+div#cgit table.list td.logsubject {
         font-family: monospace;
         font-weight: bold;
 }
 
-table.list td.logmsg {
+div#cgit table.list td.logmsg {
         font-family: monospace;
         white-space: pre;
         padding: 0 0.5em;
 }
 
-table.list td a {
+div#cgit table.list td a {
         color: black;
 }
 
-table.list td a.ls-dir {
+div#cgit table.list td a.ls-dir {
         font-weight: bold;
         color: #00f;
 }
 
-table.list td a:hover {
+div#cgit table.list td a:hover {
         color: #00f;
 }
 
-img {
+div#cgit img {
         border: none;
 }
 
-input#switch-btn {
+div#cgit input#switch-btn {
         margin: 2px 0px 0px 0px;