Merge branch 'stable'

2 files changed, 5 insertions, 3 deletions

diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.shindex 0d62cc82..33f4eb00 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/tests/t0104-tree.sh b/tests/t0104-tree.sh
index 0d62cc82..33f4eb00 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.cindex 051db7cb..9876c997 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"); }
diff --git a/ui-tree.c b/ui-tree.c
index 051db7cb..9876c997 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");
 }