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

* as/maint-completion-set-u-fix:
  bash-completion: Fix __git_ps1 to work with "set -u"
This commit is contained in:
Junio C Hamano 2010-06-30 11:55:37 -07:00
commit 304d8b6256

View File

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