Merge branch 'integration'

leto · Aug 27, 2010 · c187a50 · c187a50
2 parents 468ceaa + e2aeb48
commit c187a50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/bin/git-delete-branch b/bin/git-delete-branch
@@ -1,5 +1,4 @@
 #!/bin/sh
 
 test -z $1 && echo "branch required." && exit 1
-git branch -D $1
-git push origin :$1
+git branch -d $@ && git push origin :$1
diff --git a/bin/git-delete-tag b/bin/git-delete-tag
@@ -1,5 +1,4 @@
 #!/bin/sh
 
 test -z $1 && echo "tag required." && exit 1
-git tag -d $1
-git push origin :refs/tags/$1
+git tag -d $1 && git push origin :refs/tags/$1