X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-summary.sh;h=50ee8832090c6646c9bd114d6f5926657dcc07db;hp=3c90a6b5952e526bac9da80e84386d6abf6246a8;hb=82f304a9d9a72111fde3127b15537f67df1d6612;hpb=4956e5734d10ac88fcca7276b402f1157644cb9b

diff --git a/tg-summary.sh b/tg-summary.sh
index 3c90a6b..50ee883 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -24,6 +24,9 @@ done
 
 curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
 
+! [ -n "$terse" -a -n "$graphviz" ] ||
+	die "-t and --graphviz options are mutual exclusive"
+
 if [ -n "$graphviz" ]; then
 	cat <<EOT
 # GraphViz output; pipe to:
@@ -50,13 +53,22 @@ fi
 git for-each-ref refs/top-bases |
 	while read rev type ref; do
 		name="${ref#refs/top-bases/}"
+		if branch_annihilated "$name"; then
+			continue;
+		fi;
+
 		if [ -n "$terse" ]; then
 			echo "$name"
 			continue
 		fi
 		if [ -n "$graphviz" ]; then
 			git cat-file blob "$name:.topdeps" | while read dep; do
-				echo "\"$name\" -> \"$dep\";"
+				dep_is_tgish=true
+				ref_exists "refs/top-bases/$dep"  ||
+					dep_is_tgish=false
+				if ! "$dep_is_tgish" || ! branch_annihilated $dep; then
+					echo "\"$name\" -> \"$dep\";"
+				fi
 			done
 			continue
 		fi
@@ -98,3 +110,5 @@ git for-each-ref refs/top-bases |
 if [ -n "$graphviz" ]; then
 	echo '}'
 fi
+
+# vim:noet