Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'
tests/t0103-log.sh | 2 +- ui-log.c | 9 --------- ui-snapshot.c | 2 --
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh index def5c1812ac82017193a8d2a1be4aa22b8e39ca5..75dd761a0b51d6e9cde61b6fdebf019e43b81daa 100755 --- a/tests/t0103-log.sh +++ b/tests/t0103-log.sh @@ -18,7 +18,7 @@ ' run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp' run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp' -run_test BUG 'no links with space in path' '! grep -e "href=./with space/" trash/tmp' +run_test 'no links with space in path' '! grep -e "href=./with space/" trash/tmp' run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp' run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp' diff --git a/ui-log.c b/ui-log.c index 2e6e9d66125064c3737954ef7420240c28d26eeb..4a295bd4a484bb86ba3373a07a62f3b2ed4b1d35 100644 --- a/ui-log.c +++ b/ui-log.c @@ -95,7 +95,6 @@ void print_commit(struct commit *commit, struct rev_info *revs) { struct commitinfo *info; - char *tmp; int cols = revs->graph ? 3 : 2; struct strbuf graphbuf = STRBUF_INIT; struct strbuf msgbuf = STRBUF_INIT; @@ -129,11 +128,7 @@ strbuf_setlen(&graphbuf, 0); } else { html("<td>"); - tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); - tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); - html_link_open(tmp, NULL, NULL); cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); - html_link_close(); html("</td>"); } @@ -171,11 +166,7 @@ html_txt(info->author); if (revs->graph) { html("</td><td>"); - tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); - tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); - html_link_open(tmp, NULL, NULL); cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); - html_link_close(); } if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) { diff --git a/ui-snapshot.c b/ui-snapshot.c index 067082c30c225ef445acc8c226881436e2cb736e..126779d18f12098f5cbde679afb57b8807e2056f 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -119,13 +119,11 @@ char *snapshot; snapshot = xstrdup(filename); snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; - fprintf(stderr, "snapshot=%s\n", snapshot); if (get_sha1(snapshot, sha1) == 0) return snapshot; reponame = cgit_repobasename(url); - fprintf(stderr, "reponame=%s\n", reponame); if (prefixcmp(snapshot, reponame) == 0) { snapshot += strlen(reponame); while (snapshot && (*snapshot == '-' || *snapshot == '_'))