X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-patch.sh;h=97338ab63ef77f52eb876c77ca50b669c458f333;hb=603df20f16bcd4c11365bfad1fb7f5b3c7228c07;hp=79e5cb3890a142a048cc2013089150fc24dad20b;hpb=dfe1670c129c1ec6f46ae7b5cc610201a59cfbfd;p=topgit.git

diff --git a/tg-patch.sh b/tg-patch.sh
index 79e5cb3..97338ab 100644
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -12,7 +12,7 @@ while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
 	-*)
-		echo "Usage: tg patch [NAME]" >&2
+		echo "Usage: tg [...] patch [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"