summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-01-06 20:37:23 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-06 20:37:23 (UTC)
commitf3c99cf1cee25ae95ffea6188b40734e877bce20 (patch) (side-by-side diff)
tree6b996b4b1e8da4b8b56c8022036d5dce6d2d5e7f
parent03afc5fe1fe70b6e44b60708c89708060e6d5a90 (diff)
downloadcgit-f3c99cf1cee25ae95ffea6188b40734e877bce20.zip
cgit-f3c99cf1cee25ae95ffea6188b40734e877bce20.tar.gz
cgit-f3c99cf1cee25ae95ffea6188b40734e877bce20.tar.bz2
ui-tree.c: do not add blank line when displaying blobs
Also, fix a related bug in the test-suite. Noticed-by: Jim Meyering <jim@meyering.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xtests/t0104-tree.sh2
-rw-r--r--ui-tree.c6
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' '
'
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'
diff --git a/ui-tree.c b/ui-tree.c
index 79332fc..4bf372a 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -54,8 +54,10 @@ static void print_object(const unsigned char *sha1, char *path)
}
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");
}