mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-23 16:40:24 +02:00
Code Releases Activity

32528: vcs_info: Add check-for-staged-changes

Browse source
This commit is contained in:
Daniel Shahaf 2014-03-28 11:00:35 +00:00 • committed by Frank Terbeck
parent 4dfe62640a
commit eb4c70d0b7
5 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -5,6 +5,7 @@
setopt localoptions extendedglob NO_shwordsplit
local gitdir gitbase gitbranch gitaction gitunstaged gitstaged gitsha1
local stgitpatch stgitunapplied
local -i querystaged queryunstaged
local -A hook_com
VCS_INFO_git_getaction () {
@ -120,14 +121,24 @@ if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then
return 1
fi
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-changes" && \
if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-changes" ; then
querystaged=1
queryunstaged=1
elif zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-staged-changes" ; then
querystaged=1
fi
if (( querystaged || queryunstaged )) && \
[[ "$(${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
${vcs_comm[cmd]} diff-index --cached --quiet --ignore-submodules HEAD 2> /dev/null
(( $? && $? != 128 )) && gitstaged=1
if (( queryunstaged )) ; then
${vcs_comm[cmd]} diff --no-ext-diff --ignore-submodules --quiet --exit-code ||
gitunstaged=1
fi
if (( querystaged )) ; then
${vcs_comm[cmd]} diff-index --cached --quiet --ignore-submodules HEAD 2> /dev/null
(( $? && $? != 128 )) && gitstaged=1
fi
fi
VCS_INFO_adjust