From d4d8939410edf3b81e6cd6a63b39744262691185 Mon Sep 17 00:00:00 2001 From: JamesFerguson Date: Wed, 24 Apr 2013 09:11:52 +1000 Subject: [PATCH] Only trim remote names; be git-flow friendly - don't remove everything before the last / - do remove / - allows flow style feature/foobar branch names --- plugins/git-remote-branch/git-remote-branch.plugin.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/git-remote-branch/git-remote-branch.plugin.zsh b/plugins/git-remote-branch/git-remote-branch.plugin.zsh index ff98cbf8..6c5ab8f7 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`