completion: More fixes to prevent unbound variable errors

Several functions make use of "[-n ...]" and "[-z ...]". In many cases,
the variables being tested were declared with "local."

However, several __variables are not, and so they must be replaced with
their ${__-} equivalents.

Signed-off-by: Ted Pavlic <ted@tedpavlic.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ted Pavlic 2009-02-11 13:03:26 -05:00 committed by Junio C Hamano
parent e5dd864adf
commit 5c9cc64a4a
1 changed files with 4 additions and 4 deletions

View File

@ -62,7 +62,7 @@ esac
__gitdir () __gitdir ()
{ {
if [ -z "${1-}" ]; then if [ -z "${1-}" ]; then
if [ -n "$__git_dir" ]; then if [ -n "${__git_dir-}" ]; then
echo "$__git_dir" echo "$__git_dir"
elif [ -d .git ]; then elif [ -d .git ]; then
echo .git echo .git
@ -298,7 +298,7 @@ __git_remotes ()


__git_merge_strategies () __git_merge_strategies ()
{ {
if [ -n "$__git_merge_strategylist" ]; then if [ -n "${__git_merge_strategylist-}" ]; then
echo "$__git_merge_strategylist" echo "$__git_merge_strategylist"
return return
fi fi
@ -384,7 +384,7 @@ __git_complete_revlist ()


__git_all_commands () __git_all_commands ()
{ {
if [ -n "$__git_all_commandlist" ]; then if [ -n "${__git_all_commandlist-}" ]; then
echo "$__git_all_commandlist" echo "$__git_all_commandlist"
return return
fi fi
@ -402,7 +402,7 @@ __git_all_commandlist="$(__git_all_commands 2>/dev/null)"


__git_porcelain_commands () __git_porcelain_commands ()
{ {
if [ -n "$__git_porcelain_commandlist" ]; then if [ -n "${__git_porcelain_commandlist-}" ]; then
echo "$__git_porcelain_commandlist" echo "$__git_porcelain_commandlist"
return return
fi fi