Skip to content

Commit 0196f4b

Browse files
committed
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
2 parents 7f695d2 + cf6e7ba commit 0196f4b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

contrib/completion/git-completion.bash

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,9 @@ __git_ps1 ()
142142
elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
143143
if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
144144
if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then
145-
git diff --no-ext-diff --ignore-submodules \
146-
--quiet --exit-code || w="*"
145+
git diff --no-ext-diff --quiet --exit-code || w="*"
147146
if git rev-parse --quiet --verify HEAD >/dev/null; then
148-
git diff-index --cached --quiet \
149-
--ignore-submodules HEAD -- || i="+"
147+
git diff-index --cached --quiet HEAD -- || i="+"
150148
else
151149
i="#"
152150
fi

0 commit comments

Comments
 (0)