git: update to v2.18.0

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 2d2bb31f0e96975f54da6f04ff84dde81ecba9da..d696e20706770d120892d0073ce05fe7532b762e 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -65,6 +65,8 @@ void show_commit_decorations(struct commit *commit)
                return;
        html("<span class='decoration'>");
        while (deco) {
+               struct object_id peeled;
+               int is_annotated = 0;
                strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1);
                switch(deco->type) {
                case DECORATION_NONE:
@@ -77,7 +79,9 @@ void show_commit_decorations(struct commit *commit)
                                ctx.qry.showmsg, 0);
                        break;
                case DECORATION_REF_TAG:
-                       cgit_tag_link(buf, NULL, "tag-deco", buf);
+                       if (!peel_ref(deco->name, &peeled))
+                               is_annotated = !oidcmp(&commit->object.oid, &peeled);
+                       cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
                        break;
                case DECORATION_REF_REMOTE:
                        if (!ctx.repo->enable_remote_branches)
@@ -119,8 +123,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
        struct commit_list *parents = commit->parents;
        struct commit *parent;
        int found = 0, saved_fmt;
-       unsigned saved_flags = revs->diffopt.flags;
-
+       struct diff_flags saved_flags = revs->diffopt.flags;
 
        /* Always show if we're not in "follow" mode with a single file. */
        if (!ctx.qry.follow)
@@ -149,9 +152,9 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
        add_lines = 0;
        rem_lines = 0;
 
-       DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
-       diff_tree_oid(&parent->tree->object.oid,
-                     &commit->tree->object.oid,
+       revs->diffopt.flags.recursive = 1;
+       diff_tree_oid(&parent->maybe_tree->object.oid,
+                     &commit->maybe_tree->object.oid,
                      "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 
@@ -434,7 +437,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        rev.ignore_missing = 1;
        rev.simplify_history = 1;
        setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
-       load_ref_decorations(DECORATE_FULL_REFS);
+       load_ref_decorations(NULL, DECORATE_FULL_REFS);
        rev.show_decorations = 1;
        rev.grep_filter.ignore_case = 1;