about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-01-06 21:51:09 +0100
committerLars Hjemli <hjemli@gmail.com>2009-01-06 21:51:09 +0100
commit25f6a1f4c29b6a6009a185e9473317f0fe64616d (patch)
treefe159412ae3c4c81d0c5aabfabc4ac8cc7ce6215
parentMerge branch 'stable' (diff)
parentui-tree.c: do not add blank line when displaying blobs (diff)
downloadcgit-pink-25f6a1f4c29b6a6009a185e9473317f0fe64616d.tar.gz
cgit-pink-25f6a1f4c29b6a6009a185e9473317f0fe64616d.zip
Merge branch 'stable'
Diffstat (limited to '')
-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 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)
 		}
 		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");
 }