From: Petr Baudis Date: Fri, 12 Sep 2008 15:56:45 +0000 (+0200) Subject: tg delete: Allow branch delete if we aren't on symbolic HEAD X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=6bd23d00997d6c159a783f42a6ded71ac6b97b35 tg delete: Allow branch delete if we aren't on symbolic HEAD --- diff --git a/tg-delete.sh b/tg-delete.sh index 075d15c..26e2741 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 || [ "$(git symbolic-ref HEAD)" != "refs/heads/$name" ] || die "cannot delete your current branch" nonempty=