Make print_branch() handle refs not pointing at commits

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 8d774b05669f36a820c892e24c21c71275ba4deb..e7f7d6f43daf86212951455f307a0d0ddfa89533 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -51,7 +51,7 @@ void print_commit(struct commit *commit)
 }
 
 
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager)
+void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager)
 {
        struct rev_info rev;
        struct commit *commit;
@@ -59,8 +59,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i
        int argc = 2;
        int i;
 
-       if (grep)
-               argv[argc++] = fmt("--grep=%s", grep);
+       if (!tip)
+               argv[1] = cgit_query_head;
+
+       if (grep && pattern && (!strcmp(grep, "grep") ||
+                               !strcmp(grep, "author") ||
+                               !strcmp(grep, "committer")))
+               argv[argc++] = fmt("--%s=%s", grep, pattern);
+
        if (path) {
                argv[argc++] = "--";
                argv[argc++] = path;
@@ -110,17 +116,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i
        if (pager) {
                html("<div class='pager'>");
                if (ofs > 0) {
-                       html("&nbsp;<a href='");
-                       html(cgit_pageurl(cgit_query_repo, cgit_query_page,
-                                         fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
-                       html("'>[prev]</a>&nbsp;");
+                       cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
+                                     cgit_query_sha1, cgit_query_path,
+                                     ofs - cnt);
+                       html("&nbsp;");
                }
-
                if ((commit = get_revision(&rev)) != NULL) {
-                       html("&nbsp;<a href='");
-                       html(cgit_pageurl(cgit_query_repo, "log",
-                                         fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
-                       html("'>[next]</a>&nbsp;");
+                       cgit_log_link("[next]", NULL, NULL, cgit_query_head,
+                                     cgit_query_sha1, cgit_query_path,
+                                     ofs + cnt);
                }
                html("</div>");
        }