Only trim remote names; be git-flow friendly

- don't remove everything before the last /
 - do remove <remote_name>/
 - allows flow style feature/foobar branch names
This commit is contained in:
JamesFerguson 2013-04-24 09:11:52 +10:00
parent 93ee939383
commit d4d8939410
1 changed files with 2 additions and 1 deletions

View File

@ -6,7 +6,8 @@ _git_remote_branch() {
compadd create publish rename delete track
elif (( CURRENT == 3 )); then
# second arg: remote branch name
compadd `git branch -r | grep -v HEAD | sed "s/.*\///" | sed "s/ //g"`
remotes=`git remote | tr '\n' '|' | sed "s/\|$//g"`
compadd `git branch -r | grep -v HEAD | sed "s/$remotes\///" | sed "s/ //g"`
elif (( CURRENT == 4 )); then
# third arg: remote name
compadd `git remote`