Commit c6b339f5 authored by steeef's avatar steeef
Browse files

merge master

parent 6d5e4eae
...@@ -79,6 +79,7 @@ function steeef_chpwd { ...@@ -79,6 +79,7 @@ function steeef_chpwd {
add-zsh-hook chpwd steeef_chpwd add-zsh-hook chpwd steeef_chpwd
function steeef_precmd { function steeef_precmd {
if [[ -n "$PR_GIT_UPDATE" ]] ; then
# check for untracked files or updated submodules, since vcs_info doesn't # check for untracked files or updated submodules, since vcs_info doesn't
if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
PR_GIT_UPDATE=1 PR_GIT_UPDATE=1
...@@ -88,7 +89,6 @@ function steeef_precmd { ...@@ -88,7 +89,6 @@ function steeef_precmd {
fi fi
zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}" zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}"
if [[ -n "$PR_GIT_UPDATE" ]] ; then
vcs_info 'prompt' vcs_info 'prompt'
PR_GIT_UPDATE= PR_GIT_UPDATE=
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment