X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-patch.sh;h=a7043756424098d30403a9ec652c932cbc0b5f44;hb=90faf78fac344ce651f45c8a06c43edb42d2290d;hp=7a2471827d1e27db9a520f51541cecc4dd69c12a;hpb=459c340fd5ac765ff1e5d82895b59b53b028aaca;p=topgit.git

diff --git a/tg-patch.sh b/tg-patch.sh
index 7a24718..a704375 100644
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -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"
 
@@ -44,3 +44,5 @@ echo '-- '
 echo "tg: ($base_rev..) $name (depends on: $(git cat-file blob "$name:.topdeps" | paste -s -d' '))"
 branch_contains "$name" "$base_rev" ||
 	echo "tg: The patch is out-of-date wrt. the base! Run \`$tg update\`."
+
+# vim:noet