X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-info.sh;h=b5b92f654116c852ddae266cbacb08765a914dfb;hb=4c8ab25482e6f47878090d87a295eba50d04a564;hp=72091694d89b238f21b4af8a18cf5addcc82928a;hpb=e73f7e8baa9fad9a0632deaa3de65b7a761edb04;p=topgit.git

diff --git a/tg-info.sh b/tg-info.sh
index 7209169..b5b92f6 100644
--- a/tg-info.sh
+++ b/tg-info.sh
@@ -12,7 +12,7 @@ while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
 	-*)
-		echo "Usage: tg info [NAME]" >&2
+		echo "Usage: tg [...] info [NAME]" >&2
 		exit 1;;
 	*)
 		[ -z "$name" ] || die "name already specified ($name)"
@@ -28,7 +28,7 @@ measure="$(measure_branch "$name" "$base_rev")"
 
 echo "Topic Branch: $name ($measure)"
 if [ "$(git rev-parse --short "$name")" = "$base_rev" ]; then
-	echo "No commits."
+	echo "* No commits."
 	exit 0
 fi
 
@@ -36,14 +36,16 @@ git cat-file blob "$name:.topmsg" | grep ^Subject:
 
 echo "Base: $base_rev"
 branch_contains "$name" "$base_rev" ||
-	echo "Base is newer than head! Please run \`tg update\`."
+	echo "* Base is newer than head! Please run \`$tg update\`."
 
 if has_remote "$name"; then
 	echo "Remote Mate: $base_remote/$name"
 	branch_contains "$base_rev" "refs/remotes/$base_remote/top-bases/$name" ||
-		echo "Local base is out of date wrt. the remote base."
+		echo "* Local base is out of date wrt. the remote base."
 	branch_contains "$name" "refs/remotes/$base_remote/$name" ||
-		echo "Local head is out of date wrt. the remote head."
+		echo "* Local head is out of date wrt. the remote head."
+	branch_contains "refs/remotes/$base_remote/$name" "$name" ||
+		echo "* Local head is ahead of the remote head."
 fi
 
 git cat-file blob "$name:.topdeps" |