chiark
/
gitweb
/
~ian
/
topgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5bf892
)
tg delete: Allow branch delete if we aren't on symbolic HEAD
author
Petr Baudis
<pasky@suse.cz>
Fri, 12 Sep 2008 15:56:45 +0000
(17:56 +0200)
committer
Petr Baudis
<pasky@suse.cz>
Fri, 12 Sep 2008 15:56:45 +0000
(17:56 +0200)
tg-delete.sh
patch
|
blob
|
history
diff --git
a/tg-delete.sh
b/tg-delete.sh
index 075d15c3ab76ea402cddce32fb72ff1b030ae8ff..26e2741b5570689387c0c2b2f9e57b2fe6ccdb20 100644
(file)
--- 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=