git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zapped <zapped@mail.ru>
To: git@vger.kernel.org
Subject: [PATCH 3/3] Fixes bug: GIT_PS1_SHOWDIRTYSTATE is no not respect diff.ignoreSubmodules config variable
Date: Sat, 25 Dec 2010 04:20:49 +0300	[thread overview]
Message-ID: <1293240049-7744-3-git-send-email-zapped@mail.ru> (raw)
In-Reply-To: <1293240049-7744-1-git-send-email-zapped@mail.ru>

Signed-off-by: Zapped <zapped@mail.ru>
---
 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

  parent reply	other threads:[~2010-12-25  1:21 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-25  1:20 [PATCH 1/3] Fixes bug: git-diff: class methods are not detected in hunk headers for Pascal Zapped
2010-12-25  1:20 ` [PATCH 2/3] Fixes bug: git-svn: svn.pathnameencoding is not respected with dcommit/set-tree Zapped
2011-01-04 17:18   ` Thomas Rast
2011-01-04 23:20     ` Eric Wong
2011-02-03 20:28       ` Alexey Shumkin
2011-01-05 11:44     ` Re[2]: " Алексей Шумкин
2010-12-25  1:20 ` Zapped [this message]
2010-12-25 12:33   ` [PATCH 3/3] Fixes bug: GIT_PS1_SHOWDIRTYSTATE is no not respect diff.ignoreSubmodules config variable Jens Lehmann
2010-12-25 13:08     ` Johannes Schindelin
2010-12-26 19:14     ` Junio C Hamano
2010-12-26 22:42       ` Re[2]: " Алексей Шумкин
2010-12-27 11:14       ` Jens Lehmann
2010-12-27 22:06         ` Johannes Schindelin
2010-12-27 22:43           ` Casey Dahlin
2010-12-26 22:25     ` Re[2]: " Алексей Крезов
2010-12-28 12:14     ` Алексей Шумкин
2011-01-04 17:13 ` [PATCH 1/3] Fixes bug: git-diff: class methods are not detected in hunk headers for Pascal Thomas Rast
2011-01-05 11:53   ` Re[2]: " Алексей Шумкин
2011-01-05 14:23     ` Thomas Rast
2011-01-05 14:31       ` Thomas Rast

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1293240049-7744-3-git-send-email-zapped@mail.ru \
    --to=zapped@mail.ru \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).