diff options
| author | Lars Hjemli | 2009-01-06 21:51:09 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2009-01-06 21:51:09 +0100 |
| commit | 25f6a1f4c29b6a6009a185e9473317f0fe64616d (patch) | |
| tree | fe159412ae3c4c81d0c5aabfabc4ac8cc7ce6215 | |
| parent | Merge branch 'stable' (diff) | |
| parent | ui-tree.c: do not add blank line when displaying blobs (diff) | |
| download | cgit-25f6a1f4c29b6a6009a185e9473317f0fe64616d.tar.gz cgit-25f6a1f4c29b6a6009a185e9473317f0fe64616d.zip | |
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 | |||
| @@ -15,7 +15,7 @@ run_test 'find line 1' ' | |||
| 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' |
| diff --git a/ui-tree.c b/ui-tree.c index 051db7c..9876c99 100644 --- a/ui-tree.c +++ b/ui-tree.c | |||
| @@ -54,8 +54,10 @@ static void print_object(const unsigned char *sha1, char *path) | |||
| 54 | } | 54 | } |
| 55 | idx++; | 55 | idx++; |
| 56 | } | 56 | } |
| 57 | htmlf(linefmt, ++lineno); | 57 | if (start < idx) { |
| 58 | html_txt(buf + start); | 58 | htmlf(linefmt, ++lineno); |
| 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 | } |