X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-info.sh;h=7d6a34ca617bc8d6ffc44f81613d30715905688c;hp=f5502db9ac507a8a2db841ba2818429eb8aa5fff;hb=566ea3fef82d408955285b2928b3f481486b809f;hpb=cbb268fc6209a9d73fa9373c4e677fef327030a4

diff --git a/tg-info.sh b/tg-info.sh
index f5502db..7d6a34c 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)"
@@ -20,7 +20,7 @@ while [ -n "$1" ]; do
 	esac
 done
 
-[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
+[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
 	die "not a TopGit-controlled branch"
 
@@ -32,11 +32,11 @@ if [ "$(git rev-parse --short "$name")" = "$base_rev" ]; then
 	exit 0
 fi
 
-git cat-file blob "$name:.topmsg" | grep ^Subject:
+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"
@@ -44,6 +44,8 @@ if has_remote "$name"; then
 		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."
+	branch_contains "refs/remotes/$base_remote/$name" "$name" ||
+		echo "* Local head is ahead of the remote head."
 fi
 
 git cat-file blob "$name:.topdeps" |
@@ -71,3 +73,5 @@ else
 	echo "Up-to-date."
 fi
 rm "$depcheck"
+
+# vim:noet