git: update to v2.10.2 again

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index a31ff7c7df52c6de69cb21f66acbcc1b83ad3ee7..3220fd98aad9c7e65ea3307db361ea7b8a718ff0 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -263,8 +263,9 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 
        html("</td></tr>\n");
 
 
        html("</td></tr>\n");
 

-       if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
-               html("<tr class='nohover'>");
+       if ((revs->graph && !graph_is_commit_finished(revs->graph))
+                       || ctx.qry.showmsg) { /* Print a second table row */
+               html("<tr class='nohover-highlight'>");

 
                if (ctx.qry.showmsg) {
                        /* Concatenate commit message + notes in msgbuf */
 
                if (ctx.qry.showmsg) {
                        /* Concatenate commit message + notes in msgbuf */


@@ -325,7 +326,7 @@ static const char *disambiguate_ref(const char *ref, int *must_free_result)
        struct strbuf longref = STRBUF_INIT;
 
        strbuf_addf(&longref, "refs/heads/%s", ref);
        struct strbuf longref = STRBUF_INIT;
 
        strbuf_addf(&longref, "refs/heads/%s", ref);

-       if (get_sha1(longref.buf, oid.hash) == 0) {
+       if (get_oid(longref.buf, &oid) == 0) {

                *must_free_result = 1;
                return strbuf_detach(&longref, NULL);
        }
                *must_free_result = 1;
                return strbuf_detach(&longref, NULL);
        }