Merge branch 'as/maint-completion-set-u-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:37 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:37 +0000 (11:55 -0700)
* as/maint-completion-set-u-fix:
  bash-completion: Fix __git_ps1 to work with "set -u"

contrib/completion/git-completion.bash

index 1487437..bc9df12 100755 (executable)
@@ -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 @@ __git_ps1 ()
                        }
                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