Added in some redirection to check and hide error message in find_git_dirty

This commit is contained in:
eacousineau
2013-03-20 15:49:43 -05:00
parent c58bee1f67
commit 8c7e3069cd

View File

@@ -18,7 +18,8 @@ find_git_dirty() {
git_dirty='' git_dirty=''
else else
# Based on: http://stackoverflow.com/a/2659808/170413 # Based on: http://stackoverflow.com/a/2659808/170413
if git diff-files --quiet local err
if err=$(git diff-files --quiet 2>&1)
then then
if git diff-index --quiet --cached HEAD if git diff-index --quiet --cached HEAD
then then
@@ -27,6 +28,11 @@ find_git_dirty() {
# Can't figure out different colors # Can't figure out different colors
git_dirty="^" git_dirty="^"
fi fi
elif [ -n "$err" ]
then
# Some error - most likely that it was run within $GIT_DIR
# Resolve repo root instead? `git rev-parse --git-dir` does not work, nor does the 'git root' alias trick
git_dirty=""
else else
git_dirty="*" git_dirty="*"
fi fi