Merge branch 'stable'

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 79332fc9eb22cc83bf4a098abcaf32102862b4d1..9876c9972e9558f82632d03280997cc8db234fac 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -54,8 +54,10 @@ static void print_object(const unsigned char *sha1, char *path)
                }
                idx++;
        }
                }
                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");
 }
        html("</td></tr>\n");
        html("</table>\n");
 }


@@ -106,7 +108,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
 
        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;
        html("</td></tr>\n");
        free(name);
        return 0;