diff options
| author | ncanceill <nicolas.canceill@ens-cachan.org> | 2015-06-11 15:12:28 +0200 |
|---|---|---|
| committer | ncanceill <nicolas.canceill@ens-cachan.org> | 2015-06-11 15:12:28 +0200 |
| commit | 6c29041af73fc3668f6a3256ebc7ab532a2bbba9 (patch) | |
| tree | 45435efca967e37f5aa5133094a83dc063953c8f /plugins | |
| parent | a570f4b7f332d6a1f7b25e1d5fd9a3954e379065 (diff) | |
| download | zsh-6c29041af73fc3668f6a3256ebc7ab532a2bbba9.tar.gz zsh-6c29041af73fc3668f6a3256ebc7ab532a2bbba9.tar.bz2 zsh-6c29041af73fc3668f6a3256ebc7ab532a2bbba9.zip | |
git plugin: global var for git command
due to issues like #3962
until a proper plugin-loading system is implemented
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 28227dcb1..154a7bb9c 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -1,7 +1,6 @@ # Query/use custom command for `git`. -local git_cmd -zstyle -s ":vcs_info:git:*:-all-" "command" git_cmd -: ${git_cmd:=git} +zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd +: ${_omz_git_git_cmd:=git} # # Functions @@ -13,20 +12,20 @@ zstyle -s ":vcs_info:git:*:-all-" "command" git_cmd # it's not a symbolic ref, but in a Git repo. function current_branch() { local ref - ref=$($git_cmd symbolic-ref --quiet HEAD 2> /dev/null) + ref=$($_omz_git_git_cmd symbolic-ref --quiet HEAD 2> /dev/null) local ret=$? if [[ $ret != 0 ]]; then [[ $ret == 128 ]] && return # no git repo. - ref=$($git_cmd rev-parse --short HEAD 2> /dev/null) || return + ref=$($_omz_git_git_cmd rev-parse --short HEAD 2> /dev/null) || return fi echo ${ref#refs/heads/} } # The list of remotes function current_repository() { - if ! $git_cmd rev-parse --is-inside-work-tree &> /dev/null; then + if ! $_omz_git_git_cmd rev-parse --is-inside-work-tree &> /dev/null; then return fi - echo $($git_cmd remote -v | cut -d':' -f 2) + echo $($_omz_git_git_cmd remote -v | cut -d':' -f 2) } # Pretty log messages function _git_log_prettily(){ |