Re: [PATCH 4/4] completion: More fixes to prevent unbound variable errors.
Ted Pavlic <ted@tedpavlic.com> wrote:
Show 6 quoted lines
> 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>
Show 47 quoted lines
> ---
> contrib/completion/git-completion.bash | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index c28d6be..371148b 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -62,7 +62,7 @@ esac
> __gitdir ()
> {
> if [ -z "${1-}" ]; then
> - if [ -n "$__git_dir" ]; then
> + if [ -n "${__git_dir-}" ]; then
> echo "$__git_dir"
> elif [ -d .git ]; then
> echo .git
> @@ -298,7 +298,7 @@ __git_remotes ()
>
> __git_merge_strategies ()
> {
> - if [ -n "$__git_merge_strategylist" ]; then
> + if [ -n "${__git_merge_strategylist-}" ]; then
> echo "$__git_merge_strategylist"
> return
> fi
> @@ -384,7 +384,7 @@ __git_complete_revlist ()
>
> __git_all_commands ()
> {
> - if [ -n "$__git_all_commandlist" ]; then
> + if [ -n "${__git_all_commandlist-}" ]; then
> echo "$__git_all_commandlist"
> return
> fi
> @@ -402,7 +402,7 @@ __git_all_commandlist="$(__git_all_commands 2>/dev/null)"
>
> __git_porcelain_commands ()
> {
> - if [ -n "$__git_porcelain_commandlist" ]; then
> + if [ -n "${__git_porcelain_commandlist-}" ]; then
> echo "$__git_porcelain_commandlist"
> return
> fi
> --
> 1.6.1.2.390.gba743
> --
Shawn.
Shawn O. Pearce <spearce@spearce.org>