Merge branch 'fixes/more-help' into refs/top-bases/i/basis-merge

[topgit.git] / tg-delete.sh

diff --git a/tg-delete.sh b/tg-delete.sh
index 287c4fa738366fac09d0ce126a8f5a55d28644dc..e1eea170b36745cf7e3b7acdcdfe3fc704b8f0bc 100644 (file)
--- a/tg-delete.sh
+++ b/tg-delete.sh
@@ -3,7 +3,7 @@
 # (c) Petr Baudis <pasky@suse.cz>  2008
 # GPLv2
 
-force= # Whether to delete non-empty branch
+force= # Whether to delete non-empty branch, or branch where only the base is left.
 name=
 
 
@@ -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)"
@@ -28,19 +28,22 @@ done
 
 [ -n "$name" ] || die "no branch name specified"
 branchrev="$(git rev-parse --verify "$name" 2>/dev/null)" ||
-       die "invalid branch name: $name"
+       if [ -n "$force" ]; then
+               info "invalid branch name: $name; assuming it has been deleted already"
+       else
+               die "invalid branch name: $name"
+       fi
 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
-
-[ -z "$nonempty" ] || [ -n "$force" ] || die "branch is non-empty: $name"
+[ -z "$force" ] && { branch_empty "$name" || die "branch is non-empty: $name"; }
 
 
 ## Wipe out
 
 git update-ref -d "refs/top-bases/$name" "$baserev"
-git update-ref -d "refs/heads/$name" "$branchrev"
+[ -z "$branchrev" ] || git update-ref -d "refs/heads/$name" "$branchrev"
+
+# vim:noet