9 files changed, 73 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 2e51c31..036fcd7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
 CGIT_VERSION = v0.8.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.0.3
+GIT_VER = 1.6.1
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
 # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
 #
 
 #-include config.mak
 
 #
 # Platform specific tweaks
 #
@@ -119,26 +119,26 @@ endif
 ifdef NO_STRCASESTR
         CFLAGS += -DNO_STRCASESTR
 endif
 
 cgit: $(OBJECTS) libgit
         $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
 libgit:
-        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
-        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
+        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
 
 test: all
         $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
         mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
         install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
         install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
         install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
 
 uninstall:
         rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
diff --git a/cgit.css b/cgit.css
index 7928c2f..f19446d 100644
--- a/cgit.css
+++ b/cgit.css
@@ -462,12 +462,36 @@ span.age-months {
         color: #888;
 }
 
 span.age-years {
         color: #bbb;
 }
 div.footer {
         margin-top: 0.5em;
         text-align: center;
         font-size: 80%;
         color: #ccc;
 }
+a.branch-deco {
+        margin: 0px 0.5em;
+        padding: 0px 0.25em;
+        background-color: #88ff88;
+        border: solid 1px #007700;
+}
+a.tag-deco {
+        margin: 0px 0.5em;
+        padding: 0px 0.25em;
+        background-color: #ffff88;
+        border: solid 1px #777700;
+}
+a.remote-deco {
+        margin: 0px 0.5em;
+        padding: 0px 0.25em;
+        background-color: #ccccff;
+        border: solid 1px #000077;
+}
+a.deco {
+        margin: 0px 0.5em;
+        padding: 0px 0.25em;
+        background-color: #ff8888;
+        border: solid 1px #770000;
+}
diff --git a/git b/git
-Subproject 031e6c898f61db1ae0c0be641eac6532c1000d5
+Subproject 8104ebfe8276657ee803cca7eb8665a78cf3ef8
diff --git a/shared.c b/shared.c
index 89d1bab..a764c4d 100644
--- a/shared.c
+++ b/shared.c
@@ -258,28 +258,30 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 int cgit_diff_files(const unsigned char *old_sha1,
                      const unsigned char *new_sha1,
                      linediff_fn fn)
 {
         mmfile_t file1, file2;
         xpparam_t diff_params;
         xdemitconf_t emit_params;
         xdemitcb_t emit_cb;
 
         if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
                 return 1;
 
+        memset(&diff_params, 0, sizeof(diff_params));
+        memset(&emit_params, 0, sizeof(emit_params));
+        memset(&emit_cb, 0, sizeof(emit_cb));
         diff_params.flags = XDF_NEED_MINIMAL;
         emit_params.ctxlen = 3;
         emit_params.flags = XDL_EMIT_FUNCNAMES;
-        emit_params.find_func = NULL;
         emit_cb.outf = filediff_cb;
         emit_cb.priv = fn;
         xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
         return 0;
 }
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                     const unsigned char *new_sha1,
                     filepair_fn fn, const char *prefix)
 {
         struct diff_options opt;
         int ret;
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh
index 0d62cc8..33f4eb0 100755
--- a/tests/t0104-tree.sh
+++ b/tests/t0104-tree.sh
@@ -6,25 +6,25 @@ prepare_tests "Check content on tree page"
 
 run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp'
 run_test 'find file-1' 'grep -e "file-1" trash/tmp'
 run_test 'find file-50' 'grep -e "file-50" trash/tmp'
 
 run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp'
 
 run_test 'find line 1' '
         grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp
 '
 
 run_test 'no line 2' '
-        grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
+        ! grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
 '
 
 run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp'
 
 run_test 'verify a+b link' '
         grep -e "/foo+bar/tree/a+b" trash/tmp
 '
 
 run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp'
 
 run_test 'verify a+b?h=1+2 link' '
         grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp
diff --git a/ui-log.c b/ui-log.c
index 2f90778..c3757dd 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -22,42 +22,75 @@ void count_lines(char *line, int size)
 
         else if (line[0] == '-')
                 rem_lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
         files++;
         if (ctx.repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
+void show_commit_decorations(struct commit *commit)
+{
+        struct name_decoration *deco;
+        static char buf[1024];
+
+        buf[sizeof(buf) - 1] = 0;
+        deco = lookup_decoration(&name_decoration, &commit->object);
+        while (deco) {
+                if (!prefixcmp(deco->name, "refs/heads/")) {
+                        strncpy(buf, deco->name + 11, sizeof(buf) - 1);
+                        cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL,
+                                0, NULL, NULL, ctx.qry.showmsg);
+                }
+                else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
+                        strncpy(buf, deco->name + 15, sizeof(buf) - 1);
+                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
+                }
+                else if (!prefixcmp(deco->name, "refs/remotes/")) {
+                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
+                        cgit_log_link(buf, NULL, "remote-deco", NULL,
+                                sha1_to_hex(commit->object.sha1), NULL,
+                                0, NULL, NULL, ctx.qry.showmsg);
+                }
+                else {
+                        strncpy(buf, deco->name, sizeof(buf) - 1);
+                        cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
+                                sha1_to_hex(commit->object.sha1));
+                }
+                deco = deco->next;
+        }
+}
+
 void print_commit(struct commit *commit)
 {
         struct commitinfo *info;
         char *tmp;
         int cols = 2;
 
         info = cgit_parse_commit(commit);
         htmlf("<tr%s><td>",
                 ctx.qry.showmsg ? " class='logheader'" : "");
         tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
         tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
         html_link_open(tmp, NULL, NULL);
         cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
         html_link_close();
         htmlf("</td><td%s>",
                 ctx.qry.showmsg ? " class='logsubject'" : "");
         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                          sha1_to_hex(commit->object.sha1));
+        show_commit_decorations(commit);
         html("</td><td>");
         html_txt(info->author);
         if (ctx.repo->enable_log_filecount) {
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files);
                 html("</td><td>");
                 htmlf("%d", files);
                 if (ctx.repo->enable_log_linecount) {
                         html("</td><td>");
                         htmlf("-%d/+%d", rem_lines, add_lines);
@@ -110,24 +143,26 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                 argv[argc++] = fmt("--%s=%s", grep, pattern);
 
         if (path) {
                 argv[argc++] = "--";
                 argv[argc++] = path;
         }
         init_revisions(&rev, NULL);
         rev.abbrev = DEFAULT_ABBREV;
         rev.commit_format = CMIT_FMT_DEFAULT;
         rev.verbose_header = 1;
         rev.show_root_diff = 0;
         setup_revisions(argc, argv, &rev, NULL);
+        load_ref_decorations();
+        rev.show_decorations = 1;
         rev.grep_filter.regflags |= REG_ICASE;
         compile_grep_patterns(&rev.grep_filter);
         prepare_revision_walk(&rev);
 
         if (pager)
                 html("<table class='list nowrap'>");
 
         html("<tr class='nohover'><th class='left'>Age</th>"
               "<th class='left'>Commit message");
         if (pager) {
                 html(" (");
                 cgit_log_link("toggle", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
diff --git a/ui-patch.c b/ui-patch.c
index e60877d..1d77336 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -92,27 +92,27 @@ void cgit_print_patch(char *hex)
         info = cgit_parse_commit(commit);
 
         if (commit->parents && commit->parents->item)
                 hashcpy(old_sha1, commit->parents->item->object.sha1);
         else
                 hashclr(old_sha1);
 
         patchname = fmt("%s.patch", sha1_to_hex(sha1));
         ctx.page.mimetype = "text/plain";
         ctx.page.filename = patchname;
         cgit_print_http_headers(&ctx);
         htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
-        htmlf("From: %s%s\n", info->author, info->author_email);
+        htmlf("From: %s %s\n", info->author, info->author_email);
         html("Date: ");
-        cgit_print_date(info->author_date, "%a, %d  %b  %Y  %H:%M:%S  %z%n", ctx.cfg.local_time);
+        cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
         htmlf("Subject: %s\n\n", info->subject);
         if (info->msg && *info->msg) {
                 htmlf("%s", info->msg);
                 if (info->msg[strlen(info->msg) - 1] != '\n')
                         html("\n");
         }
         html("---\n");
         cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
         html("--\n");
         htmlf("cgit %s\n", CGIT_VERSION);
         cgit_free_commitinfo(info);
 }
diff --git a/ui-refs.c b/ui-refs.c
index d61ee7c..c35e694 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -132,25 +132,25 @@ static int print_tag(struct refinfo *ref)
                 if (info->tagger)
                         html(info->tagger);
                 html("</td><td colspan='2'>");
                 if (info->tagger_date > 0)
                         cgit_print_age(info->tagger_date, -1, NULL);
                 html("</td></tr>\n");
         } else {
                 if (!header)
                         print_tag_header();
                 html("<tr><td>");
                 html_txt(name);
                 html("</td><td>");
-                if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
+                if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
                         print_tag_downloads(ctx.repo, name);
                 else
                         cgit_object_link(ref->object);
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 static void print_refs_link(char *path)
 {
         html("<tr class='nohover'><td colspan='4'>");
         cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
diff --git a/ui-tree.c b/ui-tree.c
index 051db7c..9876c99 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -45,26 +45,28 @@ static void print_object(const unsigned char *sha1, char *path)
         start = 0;
         lineno = 0;
         while(idx < size) {
                 if (buf[idx] == '\n') {
                         buf[idx] = '\0';
                         htmlf(linefmt, ++lineno);
                         html_txt(buf + start);
                         html("</td></tr>\n");
                         start = idx + 1;
                 }
                 idx++;
         }
-        htmlf(linefmt, ++lineno);
-        html_txt(buf + start);
+        if (start < idx) {
+                htmlf(linefmt, ++lineno);
+                html_txt(buf + start);
+        }
         html("</td></tr>\n");
         html("</table>\n");
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                    const char *pathname, unsigned int mode, int stage,
                    void *cbdata)
 {
         char *name;
         char *fullpath;
         enum object_type type;