X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-delete.sh;h=f0114cc6b78568025116823078fc144c2e9cb05b;hb=14561a783f2bbf3dc21cdbdfe06296285c4f4052;hp=287c4fa738366fac09d0ce126a8f5a55d28644dc;hpb=308892d0c071135031994606170c8be6653e7197;p=topgit.git diff --git a/tg-delete.sh b/tg-delete.sh index 287c4fa..f0114cc 100644 --- a/tg-delete.sh +++ b/tg-delete.sh @@ -35,7 +35,7 @@ baserev="$(git rev-parse --verify "refs/top-bases/$name" 2>/dev/null)" || 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"