From: Zapped Date: Sat, 25 Dec 2010 01:20:49 GMT Subject: [PATCH 3/3] Fixes bug: GIT_PS1_SHOWDIRTYSTATE is no not respect diff.ignoreSubmodules config variable Message-ID: <1293240049-7744-3-git-send-email-zapped@mail.ru> In-Reply-To: <1293240049-7744-1-git-send-email-zapped@mail.ru> Signed-off-by: Zapped --- contrib/completion/git-completion.bash | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d3037fc..50fc385 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -280,7 +280,8 @@ __git_ps1 () elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then - git diff --no-ext-diff --quiet --exit-code || w="*" + is=$(git config diff.ignoreSubmodules) + git diff --no-ext-diff --quiet --exit-code --ignore-submodules=$is || w="*" if git rev-parse --quiet --verify HEAD >/dev/null; then git diff-index --cached --quiet HEAD -- || i="+" else -- 1.7.3.4.3.g3f811