summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Terbeck <bewater@users.sourceforge.net>2010-07-19 20:05:22 +0000
committerFrank Terbeck <bewater@users.sourceforge.net>2010-07-19 20:05:22 +0000
commitbb95aef24fb0228eb5dceb71e13f64de056ccc08 (patch)
tree702094f700111f91d09c2e7c0a6a9748ba5d23eb
parente03c47752b14c607c5755401fef803963784b32c (diff)
downloadzsh-bb95aef24fb0228eb5dceb71e13f64de056ccc08.tar.gz
zsh-bb95aef24fb0228eb5dceb71e13f64de056ccc08.zip
28095: Fix two hard-coded invocations of the "git" command.
-rw-r--r--ChangeLog5
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_get_data_git4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 34a7a6b24..912f0d72e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
* Seth House: 28084, 28083: Misc/vcs_info-examples: cleanups
and new examples.
+ * 28095: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: Fix
+ two hard-coded invocations of the "git" command.
+
2010-07-15 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 28073: Src/exec.c, Src/init.c, Src/utils.c: allow #!
@@ -13388,5 +13391,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5028 $
+* $Revision: 1.5029 $
*****************************************************
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 9765a6e5a..979f0177a 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -116,8 +116,8 @@ if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then
fi
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-changes" && \
- [[ "$(git rev-parse --is-inside-git-dir 2> /dev/null)" != 'true' ]] && \
- git rev-parse --quiet --verify HEAD &> /dev/null ; then
+ [[ "$(${vcs_comm[cmd]} rev-parse --is-inside-git-dir 2> /dev/null)" != 'true' ]] && \
+ ${vcs_comm[cmd]} rev-parse --quiet --verify HEAD &> /dev/null ; then
# Default: off - these are potentially expensive on big repositories
${vcs_comm[cmd]} diff --no-ext-diff --ignore-submodules --quiet --exit-code ||
gitunstaged=1