X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-summary.sh;h=55e9764001ea23c82f38eb0f3f1f1813cdedbf0a;hp=c608a18fae93d41352d65937cd5dc938846df9ae;hb=30c34d664cbd6d27272728b3619425ea3ef8744d;hpb=308892d0c071135031994606170c8be6653e7197

diff --git a/tg-summary.sh b/tg-summary.sh
index c608a18..55e9764 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -14,25 +14,24 @@ fi
 
 ## List branches
 
-git for-each-ref | cut -f 2 |
-	while read ref; do
-		name="${ref#refs/heads/}"
-		[ "$name" != "$ref" ] ||
-			continue # eew, not a branch
-		git rev-parse --verify "refs/top-bases/$name" >/dev/null 2>&1 ||
-			continue # not a TopGit branch
+git for-each-ref refs/top-bases |
+	while read rev name ref; do
+		name="${ref#refs/top-bases/}"
 
+		nonempty=
+		! branch_empty "$name" || nonempty='0'
 		deps_update=' '
 		[ -z "$(needs_update "$name")" ] || deps_update='D'
 		base_update=' '
 		branch_contains "$name" "refs/top-bases/$name" || base_update='B'
 
-		if [ "$(git rev-parse "$name")" != "$(git rev-parse "refs/top-bases/$name")" ]; then
+		if [ "$(git rev-parse "$name")" != "$rev" ]; then
 			subject="$(git cat-file blob "$name:.topmsg" | sed -n 's/^Subject: //p')"
 		else
 			# No commits yet
 			subject="(No commits)"
 		fi
 
-		printf '%s%s\t%-31s\t%s\n' "$deps_update" "$base_update" "$name" "$subject"
+		printf '%s%s%s\t%-31s\t%s\n' "$nonempty" "$deps_update" "$base_update" \
+			"$name" "$subject"
 	done