aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-10 08:52:32 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-10 08:52:32 -0800
commit0196f4b5a325251f62192f164cd1061a3fd98be8 (patch)
treef9d3a59530886037f53c36f81046b0164bf4f5af /contrib
parent7f695d262a67e1d8d970d92fe84579b6609bca96 (diff)
parentcf6e7ba1c4c29fda3f16bfd4a4f1995ed45082d5 (diff)
downloadgit-0196f4b5a325251f62192f164cd1061a3fd98be8.tar.gz
git-0196f4b5a325251f62192f164cd1061a3fd98be8.tar.xz
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes'
* tr/maint-1.6.5-bash-prompt-show-submodule-changes: bash completion: factor submodules into dirty state
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash6
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3a6498c04..965172041 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -142,11 +142,9 @@ __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 --ignore-submodules \
- --quiet --exit-code || w="*"
+ git diff --no-ext-diff --quiet --exit-code || w="*"
if git rev-parse --quiet --verify HEAD >/dev/null; then
- git diff-index --cached --quiet \
- --ignore-submodules HEAD -- || i="+"
+ git diff-index --cached --quiet HEAD -- || i="+"
else
i="#"
fi