Merge branch 'as/maint-completion-set-u-fix'

* as/maint-completion-set-u-fix:
bash-completion: Fix __git_ps1 to work with "set -u"

diff --combined contrib/completion/git-completion.bash
index 14874377afca6de0629814240086c64ff19df26d,256b1a8f9299d238af9f1633c778db705c9e1258..bc9df12bf10bdcc3942eff4dc674d6d7440b3447
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -84,8 -84,8 +84,8 @@@ __git_ps1 (
  {
        local g="$(__gitdir)"
        if [ -n "$g" ]; then
-               local r
-               local b
+               local r=""
+               local b=""
                if [ -f "$g/rebase-merge/interactive" ]; then
                        r="|REBASE-i"
                        b="$(cat "$g/rebase-merge/head-name")"
@@@ -127,11 -127,11 +127,11 @@@
                        }
                fi
  
-               local w
-               local i
-               local s
-               local u
-               local c
+               local w=""
+               local i=""
+               local s=""
+               local u=""
+               local c=""
  
                if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
                        if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
@@@ -842,7 -842,7 +842,7 @@@ _git_checkout (
        --*)
                __gitcomp "
                        --quiet --ours --theirs --track --no-track --merge
 -                      --conflict= --patch
 +                      --conflict= --orphan --patch
                        "
                ;;
        *)
@@@ -1052,7 -1052,7 +1052,7 @@@ _git_format_patch (
                        --numbered --start-number
                        --numbered-files
                        --keep-subject
 -                      --signoff
 +                      --signoff --signature --no-signature
                        --in-reply-to= --cc=
                        --full-index --binary
                        --not --all
@@@ -1726,7 -1726,6 +1726,7 @@@ _git_config (
                format.headers
                format.numbered
                format.pretty
 +              format.signature
                format.signoff
                format.subjectprefix
                format.suffix