6c29041af73fc3668f6a3256ebc7ab532a2bbba9
- Author
- ncanceill <nicolas.canceill@ens-cachan.org>
- Committer
- ncanceill <nicolas.canceill@ens-cachan.org>
- Date
Message
git plugin: global var for git command
due to issues like #3962
until a proper plugin-loading system is implemented
Diff
1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
2index 28227dcb1e26f62983e30fada75e52cb88453d9c..154a7bb9c2db4a5ffec39d4b36fe30cc33d63252 100644
3--- a/plugins/git/git.plugin.zsh
4+++ b/plugins/git/git.plugin.zsh
5@@ -1,7 +1,6 @@
6 # Query/use custom command for `git`.
7-local git_cmd
8-zstyle -s ":vcs_info:git:*:-all-" "command" git_cmd
9-: ${git_cmd:=git}
10+zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd
11+: ${_omz_git_git_cmd:=git}
12
13 #
14 # Functions
15@@ -13,20 +12,20 @@ zstyle -s ":vcs_info:git:*:-all-" "command" git_cmd
16 # it's not a symbolic ref, but in a Git repo.
17 function current_branch() {
18 local ref
19- ref=$($git_cmd symbolic-ref --quiet HEAD 2> /dev/null)
20+ ref=$($_omz_git_git_cmd symbolic-ref --quiet HEAD 2> /dev/null)
21 local ret=$?
22 if [[ $ret != 0 ]]; then
23 [[ $ret == 128 ]] && return # no git repo.
24- ref=$($git_cmd rev-parse --short HEAD 2> /dev/null) || return
25+ ref=$($_omz_git_git_cmd rev-parse --short HEAD 2> /dev/null) || return
26 fi
27 echo ${ref#refs/heads/}
28 }
29 # The list of remotes
30 function current_repository() {
31- if ! $git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
32+ if ! $_omz_git_git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
33 return
34 fi
35- echo $($git_cmd remote -v | cut -d':' -f 2)
36+ echo $($_omz_git_git_cmd remote -v | cut -d':' -f 2)
37 }
38 # Pretty log messages
39 function _git_log_prettily(){