git: update to v2.39.0

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index fd074090e9f0d60605a9feca079bc48a6a235276..565929f3f046daaf8db1c89fc3d6928c23119ad0 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -65,8 +65,9 @@ void show_commit_decorations(struct commit *commit)
                return;
        html("<span class='decoration'>");
        while (deco) {
                return;
        html("<span class='decoration'>");
        while (deco) {

-               struct object_id peeled;
+               struct object_id oid_tag, peeled;

                int is_annotated = 0;
                int is_annotated = 0;

+

                strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
                switch(deco->type) {
                case DECORATION_NONE:
                strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
                switch(deco->type) {
                case DECORATION_NONE:


@@ -79,8 +80,8 @@ void show_commit_decorations(struct commit *commit)
                                ctx.qry.showmsg, 0);
                        break;
                case DECORATION_REF_TAG:
                                ctx.qry.showmsg, 0);
                        break;
                case DECORATION_REF_TAG:

-                       if (!peel_ref(deco->name, &peeled))
-                               is_annotated = !oidcmp(&commit->object.oid, &peeled);
+                       if (!read_ref(deco->name, &oid_tag) && !peel_iterated_oid(&oid_tag, &peeled))
+                               is_annotated = !oideq(&oid_tag, &peeled);

                        cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
                        break;
                case DECORATION_REF_REMOTE:
                        cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
                        break;
                case DECORATION_REF_REMOTE:


@@ -158,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
                      "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 
                      "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 

-       found = !diff_queue_is_empty();
+       found = !diff_queue_is_empty(&revs->diffopt);

        saved_fmt = revs->diffopt.output_format;
        revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
        revs->diffopt.format_callback = cgit_diff_tree_cb;
        saved_fmt = revs->diffopt.output_format;
        revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
        revs->diffopt.format_callback = cgit_diff_tree_cb;


@@ -463,7 +464,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (pager) {
                html(" (");
                cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
        if (pager) {
                html(" (");
                cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,

-                             NULL, ctx.qry.head, ctx.qry.sha1,
+                             NULL, ctx.qry.head, ctx.qry.oid,

                              ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                              ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
                              ctx.qry.follow);
                              ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                              ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
                              ctx.qry.follow);


@@ -519,7 +520,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                if (ofs > 0) {
                        html("<li>");
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                if (ofs > 0) {
                        html("<li>");
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,

-                                     ctx.qry.sha1, ctx.qry.vpath,
+                                     ctx.qry.oid, ctx.qry.vpath,

                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);
                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);


@@ -528,7 +529,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                if ((commit = get_revision(&rev)) != NULL) {
                        html("<li>");
                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
                if ((commit = get_revision(&rev)) != NULL) {
                        html("<li>");
                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,

-                                     ctx.qry.sha1, ctx.qry.vpath,
+                                     ctx.qry.oid, ctx.qry.vpath,

                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);