Skip to content

Add rudimentary error-state detection in git-info #1665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zoybean wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −0
Open

Add rudimentary error-state detection in git-info #1665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions modules/git/functions/git-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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" \
Expand Down