X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-summary.sh;h=8616d074dc6f392f9ec1df1533339bfa6ffdc021;hb=a8d65d218c971d013e294be03e123114093f4e74;hp=3905a8fab0207e9b3908e57d90e494f109b5efa1;hpb=53d1d2a8073e65f3f769dc7ddc96605d6e917267;p=topgit.git

diff --git a/tg-summary.sh b/tg-summary.sh
index 3905a8f..8616d07 100644
--- a/tg-summary.sh
+++ b/tg-summary.sh
@@ -15,12 +15,22 @@ fi
 ## List branches
 
 git for-each-ref refs/top-bases |
-	while read rev name ref; do
+	while read rev type ref; do
 		name="${ref#refs/top-bases/}"
 		missing_deps=
 
 		nonempty=' '
 		! branch_empty "$name" || nonempty='0'
+		remote=' '
+		[ -z "$base_remote" ] || remote='l'
+		! has_remote "$name" || remote='r'
+		rem_update=' '
+		[ "$remote" != 'r' ] || {
+			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" ||
+			rem_update='L'
 		deps_update=' '
 		needs_update "$name" >/dev/null || deps_update='D'
 		deps_missing=' '
@@ -35,6 +45,6 @@ git for-each-ref refs/top-bases |
 			subject="(No commits)"
 		fi
 
-		printf '%s\t%-31s\t%s\n' "$nonempty$deps_update$deps_missing$base_update" \
+		printf '%s\t%-31s\t%s\n' "$nonempty$remote$rem_update$deps_update$deps_missing$base_update" \
 			"$name" "$subject"
 	done