diff options
| author | Robby Russell <robby@planetargon.com> | 2013-04-23 19:42:33 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-04-23 19:42:33 -0700 |
| commit | adb86fa83d7eba9b6033798395da713f5129ee06 (patch) | |
| tree | 08b35d414f19d5389933366957e653d2c5bab6b3 /plugins/git-remote-branch/git-remote-branch.plugin.zsh | |
| parent | 93ee93938337db6bc220eaa00595b40ad88c2a81 (diff) | |
| parent | d4d8939410edf3b81e6cd6a63b39744262691185 (diff) | |
| download | zsh-adb86fa83d7eba9b6033798395da713f5129ee06.tar.gz zsh-adb86fa83d7eba9b6033798395da713f5129ee06.tar.bz2 zsh-adb86fa83d7eba9b6033798395da713f5129ee06.zip | |
Merge pull request #1750 from JamesFerguson/master
Make git_remote_branch plugin git-flow friendly
Diffstat (limited to 'plugins/git-remote-branch/git-remote-branch.plugin.zsh')
| -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` |