about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rwxr-xr-xtests/t0103-log.sh2
-rw-r--r--ui-log.c9
-rw-r--r--ui-snapshot.c2
3 files changed, 1 insertions, 12 deletions
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh index def5c18..75dd761 100755 --- a/tests/t0103-log.sh +++ b/tests/t0103-log.sh
@@ -18,7 +18,7 @@ run_test 'generate "with%20space/log?qt=grep&q=commit+1"' '
18run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' 18run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
19run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp' 19run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp'
20run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp' 20run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp'
21run_test BUG 'no links with space in path' '! grep -e "href=./with space/" trash/tmp' 21run_test 'no links with space in path' '! grep -e "href=./with space/" trash/tmp'
22run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp' 22run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp'
23run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp' 23run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp'
24 24
diff --git a/ui-log.c b/ui-log.c index 2e6e9d6..4a295bd 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -95,7 +95,6 @@ void show_commit_decorations(struct commit *commit)
95void print_commit(struct commit *commit, struct rev_info *revs) 95void print_commit(struct commit *commit, struct rev_info *revs)
96{ 96{
97 struct commitinfo *info; 97 struct commitinfo *info;
98 char *tmp;
99 int cols = revs->graph ? 3 : 2; 98 int cols = revs->graph ? 3 : 2;
100 struct strbuf graphbuf = STRBUF_INIT; 99 struct strbuf graphbuf = STRBUF_INIT;
101 struct strbuf msgbuf = STRBUF_INIT; 100 struct strbuf msgbuf = STRBUF_INIT;
@@ -129,11 +128,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
129 } 128 }
130 else { 129 else {
131 html("<td>"); 130 html("<td>");
132 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
133 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
134 html_link_open(tmp, NULL, NULL);
135 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 131 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
136 html_link_close();
137 html("</td>"); 132 html("</td>");
138 } 133 }
139 134
@@ -171,11 +166,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
171 166
172 if (revs->graph) { 167 if (revs->graph) {
173 html("</td><td>"); 168 html("</td><td>");
174 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
175 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
176 html_link_open(tmp, NULL, NULL);
177 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 169 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
178 html_link_close();
179 } 170 }
180 171
181 if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) { 172 if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {
diff --git a/ui-snapshot.c b/ui-snapshot.c index 067082c..126779d 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c
@@ -119,13 +119,11 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
119 119
120 snapshot = xstrdup(filename); 120 snapshot = xstrdup(filename);
121 snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; 121 snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0';
122 fprintf(stderr, "snapshot=%s\n", snapshot);
123 122
124 if (get_sha1(snapshot, sha1) == 0) 123 if (get_sha1(snapshot, sha1) == 0)
125 return snapshot; 124 return snapshot;
126 125
127 reponame = cgit_repobasename(url); 126 reponame = cgit_repobasename(url);
128 fprintf(stderr, "reponame=%s\n", reponame);
129 if (prefixcmp(snapshot, reponame) == 0) { 127 if (prefixcmp(snapshot, reponame) == 0) {
130 snapshot += strlen(reponame); 128 snapshot += strlen(reponame);
131 while (snapshot && (*snapshot == '-' || *snapshot == '_')) 129 while (snapshot && (*snapshot == '-' || *snapshot == '_'))