From f3c99cf1cee25ae95ffea6188b40734e877bce20 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Tue, 6 Jan 2009 21:37:23 +0100 Subject: ui-tree.c: do not add blank line when displaying blobs Also, fix a related bug in the test-suite. Noticed-by: Jim Meyering Signed-off-by: Lars Hjemli --- tests/t0104-tree.sh | 2 +- 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' ' ' run_test 'no line 2' ' - grep -e "2" trash/tmp + ! grep -e "2" 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("\n"); html("\n"); } -- cgit v1.2.3-54-g00ecf