dominic/prezto
1
0
Fork 0
Code Releases Activity

Add rudimentary error-state detection in git-info

Browse source 
* If status_cmd fails, increment the error count
* Add :prezto:module:git:info:error (%E) to format error count
This commit is contained in:
Zoey Llewellyn Hewll 2017-10-07 10:41:48 +08:00
parent a338cba805
commit 5ea4b989b1
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/git/functions/git-info
View file

@ -139,6 +139,9 @@ function git-info {
local dirty=0
local dirty_format
local dirty_formatted
local error=0
local error_format
local error_formatted
local ignore_submodules
local indexed=0
local indexed_format
@ -351,6 +354,7 @@ function git-info {
else
# Use porcelain status for easy parsing.
status_cmd="command git status --porcelain --ignore-submodules=${ignore_submodules:-none}"
${(z)status_cmd} &> /dev/null || error=1
# Get current status.
while IFS=$'\n' read line; do
@ -411,6 +415,12 @@ function git-info {
zstyle -s ':prezto:module:git:info:clean' format 'clean_formatted'
fi
# Format error.
if (( error > 0 )); then
zstyle -s ':prezto:module:git:info:error' format 'error_format'
zformat -f error_formatted "$error_format" "E:$error"
fi
# Format info.
zstyle -a ':prezto:module:git:info:keys' format 'info_formats'
for info_format in ${(k)info_formats}; do
@ -423,6 +433,7 @@ function git-info {
"c:$commit_formatted" \
"d:$deleted_formatted" \
"D:$dirty_formatted" \
"E:$error_formatted" \
"i:$indexed_formatted" \
"I:$unindexed_formatted" \
"m:$modified_formatted" \