X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-summary.sh;h=409f45622910caf29b5f6d68a2930b3f76b6a274;hb=3de9840b7e29d711917d01f8eb3a18e78e8d6d9d;hp=1d679c44078587ee9ba3c267320ec66932b59f5d;hpb=ef028024666dde5fdc3afb8c348e75e2c37dd603;p=topgit.git

diff --git a/tg-summary.sh b/tg-summary.sh
index 1d679c4..409f456 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -7,10 +7,12 @@
 ## Parse options
 
 if [ -n "$1" ]; then
-	echo "Usage: tg summary" >&2
+	echo "Usage: tg [...] summary" >&2
 	exit 1
 fi
 
+curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
+
 
 ## List branches
 
@@ -19,16 +21,20 @@ git for-each-ref refs/top-bases |
 		name="${ref#refs/top-bases/}"
 		missing_deps=
 
+		current=' '
+		[ "$name" != "$curname" ] || current='>'
 		nonempty=' '
 		! branch_empty "$name" || nonempty='0'
 		remote=' '
 		[ -z "$base_remote" ] || remote='l'
 		! has_remote "$name" || remote='r'
 		rem_update=' '
-		[ "$remote" != 'r' ] || {
+		[ "$remote" != 'r' ] || ! ref_exists "refs/remotes/$base_remote/top-bases/$name" || {
 			branch_contains "refs/top-bases/$name" "refs/remotes/$base_remote/top-bases/$name" &&
 			branch_contains "$name" "refs/remotes/$base_remote/$name"
 		} || rem_update='R'
+		[ "$rem_update" = 'R' ] || branch_contains "refs/remotes/$base_remote/$name" "$name" 2>/dev/null ||
+			rem_update='L'
 		deps_update=' '
 		needs_update "$name" >/dev/null || deps_update='D'
 		deps_missing=' '
@@ -43,6 +49,6 @@ git for-each-ref refs/top-bases |
 			subject="(No commits)"
 		fi
 
-		printf '%s\t%-31s\t%s\n' "$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
+		printf '%s\t%-31s\t%s\n' "$current$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
 			"$name" "$subject"
 	done