Merge branch 'maint'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 307bf5d4f98d2d4c26b130fe69807223b64f5bb4..f44f63cfebf68f773dd96bd82317801d468f6cff 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -34,11 +34,11 @@
 #       are currently in a git repository.  The %s token will be
 #       the name of the current branch.
 #
-#      In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty
-#      value, unstaged (*) and staged (+) changes will be shown next
-#      to the branch name.  You can configure this per-repository
-#      with the bash.showDirtyState variable, which defaults to true
-#      once GIT_PS1_SHOWDIRTYSTATE is enabled.
+#       In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty
+#       value, unstaged (*) and staged (+) changes will be shown next
+#       to the branch name.  You can configure this per-repository
+#       with the bash.showDirtyState variable, which defaults to true
+#       once GIT_PS1_SHOWDIRTYSTATE is enabled.
 #
 # To submit patches:
 #
@@ -125,7 +125,7 @@ __git_ps1 ()
                local w
                local i
 
-               if test -n "$GIT_PS1_SHOWDIRTYSTATE"; then
+               if test -n "${GIT_PS1_SHOWDIRTYSTATE-}"; then
                        if test "$(git config --bool bash.showDirtyState)" != "false"; then
                                git diff --no-ext-diff --ignore-submodules \
                                        --quiet --exit-code || w="*"