author | Lars Hjemli <hjemli@gmail.com> | 2009-01-06 20:51:09 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-06 20:51:09 (UTC) |
commit | 25f6a1f4c29b6a6009a185e9473317f0fe64616d (patch) (side-by-side diff) | |
tree | fe159412ae3c4c81d0c5aabfabc4ac8cc7ce6215 | |
parent | 50fbd46c917a06f60235da59adb860697ea94eb0 (diff) | |
parent | f3c99cf1cee25ae95ffea6188b40734e877bce20 (diff) | |
download | cgit-25f6a1f4c29b6a6009a185e9473317f0fe64616d.zip cgit-25f6a1f4c29b6a6009a185e9473317f0fe64616d.tar.gz cgit-25f6a1f4c29b6a6009a185e9473317f0fe64616d.tar.bz2 |
Merge branch 'stable'
-rwxr-xr-x | tests/t0104-tree.sh | 2 | ||||
-rw-r--r-- | ui-tree.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh index 0d62cc8..33f4eb0 100755 --- a/tests/t0104-tree.sh +++ b/tests/t0104-tree.sh @@ -10,17 +10,17 @@ run_test 'find file-50' 'grep -e "file-50" trash/tmp' run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' run_test 'find line 1' ' grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp ' run_test 'no line 2' ' - grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp + ! grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp ' run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' run_test 'verify a+b link' ' grep -e "/foo+bar/tree/a+b" trash/tmp ' @@ -49,18 +49,20 @@ static void print_object(const unsigned char *sha1, char *path) buf[idx] = '\0'; htmlf(linefmt, ++lineno); html_txt(buf + start); html("</td></tr>\n"); start = idx + 1; } 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"); } static int ls_item(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned int mode, int stage, void *cbdata) |