flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git_branch_delete_all should take '-f' arg to use -D arg

Browse Source
This commit is contained in:
Nathan Broadbent
2012-11-28 19:40:38 +13:00
parent bc969b3e6f
commit 2ef3776fe1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/git/tools.sh
View File

@@ -129,11 +129,14 @@ fi
# Delete a git branch from local, cached remote and remote server # Delete a git branch from local, cached remote and remote server
git_branch_delete_all() { git_branch_delete_all() {
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Usage: git_branch_delete_all branch" echo "Usage: git_branch_delete_all branch (-f forces deletion of unmerged branches.)"
return return
fi fi
$_git_cmd branch -D $1 local opt="-d"
$_git_cmd branch -D -r origin/$1 if [ "$2" = '-f' ] || [ "$2" = '--force' ]; then opt="-D"; fi
$_git_cmd branch $opt $1
$_git_cmd branch $opt -r origin/$1
$_git_cmd push origin :$1 $_git_cmd push origin :$1
} }