From 43fcd6ee4c3d1e89c9bb3ec036e6bd462e8e068b Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 11 Jun 2015 15:12:28 +0200
Subject: [PATCH] git plugin: global var for git command due to issues like
 #3962 until a proper plugin-loading system is implemented

---
 plugins/git/git.plugin.zsh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 28227dcb1e26..154a7bb9c2db 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(){