X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-delete.sh;h=ab121c2597c11534ff251944ade590490e151b23;hp=f0114cc6b78568025116823078fc144c2e9cb05b;hb=991921b9e0009b6127e0c3d996c682bee555b99b;hpb=749b6480eb88ab6703a8143e24e853777b82dca1

diff --git a/tg-delete.sh b/tg-delete.sh
index f0114cc..ab121c2 100644
--- a/tg-delete.sh
+++ b/tg-delete.sh
@@ -15,7 +15,7 @@ while [ -n "$1" ]; do
 	-f)
 		force=1;;
 	-*)
-		echo "Usage: tg delete [-f] NAME" >&2
+		echo "Usage: tg [...] delete [-f] NAME" >&2
 		exit 1;;
 	*)
 		[ -z "$name" ] || die "name already specified ($name)"
@@ -31,7 +31,7 @@ branchrev="$(git rev-parse --verify "$name" 2>/dev/null)" ||
 	die "invalid branch name: $name"
 baserev="$(git rev-parse --verify "refs/top-bases/$name" 2>/dev/null)" ||
 	die "not a TopGit topic branch: $name"
-[ "$(git symbolic-ref HEAD)" != "refs/heads/$name" ] ||
+! git symbolic-ref HEAD >/dev/null || [ "$(git symbolic-ref HEAD)" != "refs/heads/$name" ] ||
 	die "cannot delete your current branch"
 
 nonempty=
@@ -44,3 +44,5 @@ branch_empty "$name" || nonempty=1
 
 git update-ref -d "refs/top-bases/$name" "$baserev"
 git update-ref -d "refs/heads/$name" "$branchrev"
+
+# vim:noet