mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-03-20 03:13:33 +01:00
return if not inside git worktree to maintain compatibility
with existing themes that use git_prompt_info()
This commit is contained in:
parent
78d76183df
commit
be2edcdc72
1 changed files with 4 additions and 3 deletions
|
|
@ -78,11 +78,12 @@ function git_prompt_long_sha() {
|
||||||
git_prompt_status() {
|
git_prompt_status() {
|
||||||
INDEX=$(command git status --porcelain -b 2> /dev/null)
|
INDEX=$(command git status --porcelain -b 2> /dev/null)
|
||||||
STATUS=""
|
STATUS=""
|
||||||
$(git diff --no-ext-diff --quiet --exit-code) || STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_MODIFIED"
|
|
||||||
repo_info=$(git rev-parse --git-dir --is-inside-git-dir --is-bare-repository --is-inside-work-tree --short HEAD 2>/dev/null)
|
repo_info=$(git rev-parse --git-dir --is-inside-git-dir --is-bare-repository --is-inside-work-tree --short HEAD 2>/dev/null)
|
||||||
if [ $? -eq 0 ]; then
|
if [ -z $repo_info ]; then
|
||||||
$(git diff-index --cached --quiet HEAD --) || STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_ADDED"
|
return
|
||||||
fi
|
fi
|
||||||
|
$(git diff --no-ext-diff --quiet --exit-code) || STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_MODIFIED"
|
||||||
|
$(git diff-index --cached --quiet HEAD --) || STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_ADDED"
|
||||||
if $(git ls-files --others --exclude-standard --error-unmatch -- ':/*' >/dev/null 2>/dev/null); then
|
if $(git ls-files --others --exclude-standard --error-unmatch -- ':/*' >/dev/null 2>/dev/null); then
|
||||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
|
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue