Merge branch 'stable'

diff --combined ui-tree.c
index 051db7cb28cbf2321ca67582aac866596743a465,4bf372a6ce73b75984b1959149193b16266e4642..9876c9972e9558f82632d03280997cc8db234fac
--- 1/ui-tree.c
--- 2/ui-tree.c
+++ b/ui-tree.c
@@@ -54,8 -54,10 +54,10 @@@ static void print_object(const unsigne
                }
                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");
  }
@@@ -106,7 -108,7 +108,7 @@@ static int ls_item(const unsigned char 
  
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
 -                    fullpath, 0, NULL, NULL);
 +                    fullpath, 0, NULL, NULL, ctx.qry.showmsg);
        html("</td></tr>\n");
        free(name);
        return 0;