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) (unidiff) | |
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 | 2 |
2 files changed, 3 insertions, 1 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 | |||
@@ -14,9 +14,9 @@ run_test 'find line 1' ' | |||
14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp | 14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp |
15 | ' | 15 | ' |
16 | 16 | ||
17 | run_test 'no line 2' ' | 17 | run_test 'no line 2' ' |
18 | grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp | 18 | ! grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp |
19 | ' | 19 | ' |
20 | 20 | ||
21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' | 21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' |
22 | 22 | ||
@@ -53,10 +53,12 @@ static void print_object(const unsigned char *sha1, char *path) | |||
53 | start = idx + 1; | 53 | start = idx + 1; |
54 | } | 54 | } |
55 | idx++; | 55 | idx++; |
56 | } | 56 | } |
57 | if (start < idx) { | ||
57 | htmlf(linefmt, ++lineno); | 58 | htmlf(linefmt, ++lineno); |
58 | html_txt(buf + start); | 59 | html_txt(buf + start); |
60 | } | ||
59 | html("</td></tr>\n"); | 61 | html("</td></tr>\n"); |
60 | html("</table>\n"); | 62 | html("</table>\n"); |
61 | } | 63 | } |
62 | 64 | ||