mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-06 23:06:14 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2010-01-10 08:52:32 -08:00
parent 7f695d262a cf6e7ba1c4
commit 0196f4b5a3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/completion/git-completion.bash
View File

@ -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