linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a052271af3 into 27c6becffd

Browse source
This commit is contained in:
Romain Perier 2013-05-11 02:52:50 -07:00
commit 12432b8037
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

@ -69,8 +69,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=$(git status --porcelain -b 2> /dev/null)
STATUS="" STATUS=""
if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
INDEX=$(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
@ -111,6 +112,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
} }