X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-delete.sh;h=7f7ede7068d71bd5f50e10686ea87398f26f1b41;hp=f0114cc6b78568025116823078fc144c2e9cb05b;hb=9f5917da92ab8c32ab765a331ebcaf227b3e2f85;hpb=749b6480eb88ab6703a8143e24e853777b82dca1 diff --git a/tg-delete.sh b/tg-delete.sh index f0114cc..7f7ede7 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=