|
diff --git a/ui-log.c b/ui-log.c index 8dd8b89..d212984 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -63,20 +63,33 @@ void print_commit(struct commit *commit) |
63 | html("</td></tr>\n"); |
63 | html("</td></tr>\n"); |
64 | cgit_free_commitinfo(info); |
64 | cgit_free_commitinfo(info); |
65 | } |
65 | } |
66 | |
66 | |
| |
67 | static const char *disambiguate_ref(const char *ref) |
| |
68 | { |
| |
69 | unsigned char sha1[20]; |
| |
70 | const char *longref; |
| |
71 | |
| |
72 | longref = fmt("refs/heads/%s", ref); |
| |
73 | if (get_sha1(longref, sha1) == 0) |
| |
74 | return longref; |
| |
75 | |
| |
76 | return ref; |
| |
77 | } |
67 | |
78 | |
68 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
79 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
69 | char *path, int pager) |
80 | char *path, int pager) |
70 | { |
81 | { |
71 | struct rev_info rev; |
82 | struct rev_info rev; |
72 | struct commit *commit; |
83 | struct commit *commit; |
73 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
84 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
74 | int argc = 2; |
85 | int argc = 2; |
75 | int i, columns = 3; |
86 | int i, columns = 3; |
76 | |
87 | |
77 | if (!tip) |
88 | if (!tip) |
78 | argv[1] = ctx.qry.head; |
89 | tip = ctx.qry.head; |
| |
90 | |
| |
91 | argv[1] = disambiguate_ref(tip); |
79 | |
92 | |
80 | if (grep && pattern && (!strcmp(grep, "grep") || |
93 | if (grep && pattern && (!strcmp(grep, "grep") || |
81 | !strcmp(grep, "author") || |
94 | !strcmp(grep, "author") || |
82 | !strcmp(grep, "committer"))) |
95 | !strcmp(grep, "committer"))) |
|