git: update for git 2.0

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 584336a9766c0a6d6aa4d8bb33d5f28f185d583e..2de8017329f2acb60d0803564c26b25c5e2ff5d8 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -63,21 +63,21 @@ void show_commit_decorations(struct commit *commit)
        deco = lookup_decoration(&name_decoration, &commit->object);
        html("<span class='decoration'>");
        while (deco) {
        deco = lookup_decoration(&name_decoration, &commit->object);
        html("<span class='decoration'>");
        while (deco) {

-               if (!prefixcmp(deco->name, "refs/heads/")) {
+               if (starts_with(deco->name, "refs/heads/")) {

                        strncpy(buf, deco->name + 11, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
                                      ctx.qry.vpath, 0, NULL, NULL,
                                      ctx.qry.showmsg);
                }
                        strncpy(buf, deco->name + 11, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
                                      ctx.qry.vpath, 0, NULL, NULL,
                                      ctx.qry.showmsg);
                }

-               else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
+               else if (starts_with(deco->name, "tag: refs/tags/")) {

                        strncpy(buf, deco->name + 15, sizeof(buf) - 1);
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }
                        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/tags/")) {
+               else if (starts_with(deco->name, "refs/tags/")) {

                        strncpy(buf, deco->name + 10, sizeof(buf) - 1);
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }
                        strncpy(buf, deco->name + 10, sizeof(buf) - 1);
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }

-               else if (!prefixcmp(deco->name, "refs/remotes/")) {
+               else if (starts_with(deco->name, "refs/remotes/")) {

                        if (!ctx.repo->enable_remote_branches)
                                goto next;
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        if (!ctx.repo->enable_remote_branches)
                                goto next;
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);


@@ -168,7 +168,9 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
                         sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
        show_commit_decorations(commit);
        html("</td><td>");
                         sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
        show_commit_decorations(commit);
        html("</td><td>");

+       cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");

        html_txt(info->author);
        html_txt(info->author);

+       cgit_close_filter(ctx.repo->email_filter);

 
        if (revs->graph) {
                html("</td><td>");
 
        if (revs->graph) {
                html("</td><td>");