From ff0e50c0869096a0f19c484f0306c0bf92d08d07 Mon Sep 17 00:00:00 2001 From: Cassiano Leal Date: Fri, 12 Sep 2014 15:38:38 +0100 Subject: [PATCH] Fix #3126 - parse_git_dirty() always returns dirty if branch = 1 on .gitconfig --- lib/git.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git.zsh b/lib/git.zsh index 7aa5a0ea2..b6674da9d 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -18,9 +18,9 @@ parse_git_dirty() { SUBMODULE_SYNTAX="--ignore-submodules=dirty" fi if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then - GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1) + GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | grep -v '^##' | tail -n1) else - GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1) + GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | grep -v '^##' | tail -n1) fi if [[ -n $GIT_STATUS ]]; then echo "$ZSH_THEME_GIT_PROMPT_DIRTY"