Merge commit 'topgit-0.5'

[topgit.git] / tg-delete.sh

diff --git a/tg-delete.sh b/tg-delete.sh
index 287c4fa738366fac09d0ce126a8f5a55d28644dc..7f7ede7068d71bd5f50e10686ea87398f26f1b41 100644 (file)
--- 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,11 +31,11 @@ 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=
-[ -z "$(git diff-tree "refs/top-bases/$name" "$name" | fgrep -v "      .top")" ] || nonempty=1
+branch_empty "$name" || nonempty=1
 
 [ -z "$nonempty" ] || [ -n "$force" ] || die "branch is non-empty: $name"