linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-05 01:46:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from h4ck3r0/perf(git)-speed-up-prompt-by-skipping-untracked-files-check-(#13082)

Browse source 
perf(git): speed up prompt by skipping untracked files check  - Modif…
This commit is contained in:
Raj Aryan 2025-10-01 20:58:11 +05:30 • committed by GitHub
commit dad13bd083
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/git.zsh
View file

@ -43,7 +43,6 @@ function _omz_git_prompt_status() {
[[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
# Maps a git status prefix to an internal constant # Maps a git status prefix to an internal constant
# This cannot use the prompt constants, as they may be empty
local -A prefix_constant_map local -A prefix_constant_map
prefix_constant_map=( prefix_constant_map=(
'\?\? ' 'UNTRACKED' '\?\? ' 'UNTRACKED'
@ -78,22 +77,26 @@ function _omz_git_prompt_status() {
'STASHED' "$ZSH_THEME_GIT_PROMPT_STASHED" 'STASHED' "$ZSH_THEME_GIT_PROMPT_STASHED"
) )
# The order that the prompt displays should be added to the prompt
local status_constants local status_constants
status_constants=( status_constants=(
UNTRACKED ADDED MODIFIED RENAMED DELETED UNTRACKED ADDED MODIFIED RENAMED DELETED
STASHED UNMERGED AHEAD BEHIND DIVERGED STASHED UNMERGED AHEAD BEHIND DIVERGED
) )
#FIX START: respect DISABLE_UNTRACKED_FILES_DIRTY to avoid slow scans
local status_text local status_text
if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then
status_text="$(__git_prompt_git status --porcelain -b --untracked-files=no 2> /dev/null)"
else
status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)" status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
fi
#FIX END
# Don't continue on a catastrophic failure # Don't continue on a catastrophic failure
if [[ $? -eq 128 ]]; then if [[ $? -eq 128 ]]; then
return 1 return 1
fi fi
# A lookup table of each git status encountered
local -A statuses_seen local -A statuses_seen
if __git_prompt_git rev-parse --verify refs/stash &>/dev/null; then if __git_prompt_git rev-parse --verify refs/stash &>/dev/null; then
@ -103,7 +106,6 @@ function _omz_git_prompt_status() {
local status_lines local status_lines
status_lines=("${(@f)${status_text}}") status_lines=("${(@f)${status_text}}")
# If the tracking line exists, get and parse it
if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then
local branch_statuses local branch_statuses
branch_statuses=("${(@s/,/)match}") branch_statuses=("${(@s/,/)match}")
@ -116,7 +118,6 @@ function _omz_git_prompt_status() {
done done
fi fi
# For each status prefix, do a regex comparison
for status_prefix in ${(k)prefix_constant_map}; do for status_prefix in ${(k)prefix_constant_map}; do
local status_constant="${prefix_constant_map[$status_prefix]}" local status_constant="${prefix_constant_map[$status_prefix]}"
local status_regex=$'(^|\n)'"$status_prefix" local status_regex=$'(^|\n)'"$status_prefix"
@ -126,7 +127,6 @@ function _omz_git_prompt_status() {
fi fi
done done
# Display the seen statuses in the order specified
local status_prompt local status_prompt
for status_constant in $status_constants; do for status_constant in $status_constants; do
if (( ${+statuses_seen[$status_constant]} )); then if (( ${+statuses_seen[$status_constant]} )); then
@ -138,6 +138,7 @@ function _omz_git_prompt_status() {
echo $status_prompt echo $status_prompt
} }
# Use async version if setting is enabled, or unset but zsh version is at least 5.0.6. # Use async version if setting is enabled, or unset but zsh version is at least 5.0.6.
# This avoids async prompt issues caused by previous zsh versions: # This avoids async prompt issues caused by previous zsh versions:
# - https://github.com/ohmyzsh/ohmyzsh/issues/12331 # - https://github.com/ohmyzsh/ohmyzsh/issues/12331