diff options
| -rw-r--r-- | lib/git.zsh | 2 | ||||
| -rw-r--r-- | plugins/git-remote-branch/git-remote-branch.plugin.zsh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 5f8453112..b023c9ac3 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -25,6 +25,8 @@ parse_git_dirty() { else echo "$ZSH_THEME_GIT_PROMPT_CLEAN" fi + else + echo "$ZSH_THEME_GIT_PROMPT_CLEAN" fi } 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` |