Merge pull request #1750 from JamesFerguson/master

Make git_remote_branch plugin git-flow friendly
13 years ago · adb86fa83d
parent 93ee939383 d4d8939410
commit adb86fa83d
1 changed files with 2 additions and 1 deletions
--- 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`