diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 12:22:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 12:22:54 -0800 |
| commit | 91d23be16767bf820401a6ba9a9397aa146c977a (patch) | |
| tree | 036b6ebb86c38e4eb3117d5892022a0959c8d626 | |
| parent | e7706554c5b8433aef34c01b9db137dd9e6c2729 (diff) | |
| parent | cf6e7ba1c4c29fda3f16bfd4a4f1995ed45082d5 (diff) | |
| download | git-91d23be16767bf820401a6ba9a9397aa146c977a.tar.gz git-91d23be16767bf820401a6ba9a9397aa146c977a.tar.xz | |
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5
* tr/maint-1.6.5-bash-prompt-show-submodule-changes:
bash completion: factor submodules into dirty state
| -rwxr-xr-x | contrib/completion/git-completion.bash | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 7cf855746..4cb89a125 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -148,11 +148,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 |