Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-09-28 14:06:12 +02:00
Code Issues Releases Wiki Activity

perf(git): fork git less often for the prompt

Browse Source 
`_omz_git_prompt_info` ran `git rev-parse --git-dir` and then
`git symbolic-ref --short HEAD` as two separate processes. Ask for both
in one `git rev-parse --git-dir --abbrev-ref HEAD` call; a detached HEAD
prints "HEAD" and falls through to the tag/SHA lookups as before, and an
unborn branch (exit 128 after printing the git dir) falls back to
`symbolic-ref` so freshly initialised repositories still show their
branch.

`parse_git_dirty` piped `git status --porcelain` through `tail -n 1`,
but only tests whether the output is empty, so the pipe is dropped.

Output verified identical for: outside a repo, unborn, unborn with
staged files, clean, dirty, detached, detached on a tag, hide-info,
hide-dirty, subdirectory. Two fewer forks per prompt; ~13 ms less on
macOS arm64 for a clean branch.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Robby Russell
2026-09-06 08:08:19 -07:00
co-authored by Claude Fable 5.1
parent 426650fbe8
commit 01bbde85c4
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/git.zsh
+19 -10
View File
@@ -12,10 +12,16 @@ function __git_prompt_git() {
} }
function _omz_git_prompt_info() { function _omz_git_prompt_info() {
# If we are on a folder not tracked by git, get out. # Get the git dir and the current branch name in one call. Outside a repo
# Otherwise, check for hide-info at global and local repository level # there is no output. On a detached HEAD the branch is "HEAD". On an unborn
if ! __git_prompt_git rev-parse --git-dir &> /dev/null \ # branch git exits non-zero after printing the git dir.
|| [[ "$(__git_prompt_git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then local -a info
info=("${(@f)$(__git_prompt_git rev-parse --git-dir --abbrev-ref HEAD 2> /dev/null)}")
local unborn=$(( $? != 0 ))
[[ -n "$info[1]" ]] || return 0
# Check for hide-info at global and local repository level
if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then
return 0 return 0
fi fi
@@ -23,11 +29,14 @@ function _omz_git_prompt_info() {
# - the current branch name # - the current branch name
# - the tag name if we are on a tag # - the tag name if we are on a tag
# - the short SHA of the current commit # - the short SHA of the current commit
local ref local ref="$info[2]"
ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \ if (( unborn )); then
|| ref=$(__git_prompt_git describe --tags --exact-match HEAD 2> /dev/null) \ ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) || return 0
|| ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \ elif [[ "$ref" == HEAD ]]; then
|| return 0 ref=$(__git_prompt_git describe --tags --exact-match HEAD 2> /dev/null) \
|| ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \
|| return 0
fi
# Use global ZSH_THEME_GIT_SHOW_UPSTREAM=1 for including upstream remote info # Use global ZSH_THEME_GIT_SHOW_UPSTREAM=1 for including upstream remote info
local upstream local upstream
@@ -244,7 +253,7 @@ function parse_git_dirty() {
FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}" FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
;; ;;
esac esac
STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1) STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null)
fi fi
if [[ -n $STATUS ]]; then if [[ -n $STATUS ]]; then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY" echo "$ZSH_THEME_GIT_PROMPT_DIRTY"