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:
c675378
)
tg delete: Fix spurious output
author
Petr Baudis
<pasky@suse.cz>
Mon, 22 Sep 2008 16:58:57 +0000
(18:58 +0200)
committer
Petr Baudis
<pasky@suse.cz>
Mon, 22 Sep 2008 16:58:57 +0000
(18:58 +0200)
tg-delete.sh
patch
|
blob
|
history
diff --git
a/tg-delete.sh
b/tg-delete.sh
index 26e2741b5570689387c0c2b2f9e57b2fe6ccdb20..7f7ede7068d71bd5f50e10686ea87398f26f1b41 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 || [ "$(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=