diff options
| author | JamesFerguson <jim@The-Ocean.local> | 2013-04-24 09:11:52 +1000 |
|---|---|---|
| committer | JamesFerguson <jim@The-Ocean.local> | 2013-04-24 09:11:52 +1000 |
| commit | d4d8939410edf3b81e6cd6a63b39744262691185 (patch) | |
| tree | 08b35d414f19d5389933366957e653d2c5bab6b3 /plugins | |
| parent | 93ee93938337db6bc220eaa00595b40ad88c2a81 (diff) | |
| download | zsh-d4d8939410edf3b81e6cd6a63b39744262691185.tar.gz zsh-d4d8939410edf3b81e6cd6a63b39744262691185.tar.bz2 zsh-d4d8939410edf3b81e6cd6a63b39744262691185.zip | |
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
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git-remote-branch/git-remote-branch.plugin.zsh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/git-remote-branch/git-remote-branch.plugin.zsh b/plugins/git-remote-branch/git-remote-branch.plugin.zsh index ff98cbf87..6c5ab8f70 100644 --- a/plugins/git-remote-branch/git-remote-branch.plugin.zsh +++ b/plugins/git-remote-branch/git-remote-branch.plugin.zsh @@ -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` |