linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-20 03:13:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 7ed2ff87ab into 8efdbef778

Browse source
This commit is contained in:
Zeeshan Qureshi 2014-12-15 00:29:54 +00:00
commit ead02693a3
1 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/git.zsh
View file

@ -76,8 +76,9 @@ function git_prompt_long_sha() {
# Get the status of the working tree # Get the status of the working tree
git_prompt_status() { git_prompt_status() {
INDEX=$(command git status --porcelain -b 2> /dev/null)
STATUS="" STATUS=""
if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
INDEX=$(command git status --porcelain -b 2> /dev/null)
if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS" STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
fi fi
@ -118,6 +119,7 @@ git_prompt_status() {
if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS" STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
fi fi
fi
echo $STATUS echo $STATUS
} }