X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-delete.sh;h=ab121c2597c11534ff251944ade590490e151b23;hb=fb1f5d8decc74bf60a3075ec92908d60e6b3402b;hp=075d15c3ab76ea402cddce32fb72ff1b030ae8ff;hpb=0cbd6990ae81d73fdec784f4bd8e7b8e42d16e97;p=topgit.git diff --git a/tg-delete.sh b/tg-delete.sh index 075d15c..ab121c2 100644 --- a/tg-delete.sh +++ b/tg-delete.sh @@ -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