[PATCH 4/3] completion: More fixes to prevent unbound variable errors.
- From
Ted Pavlic <ted@tedpavlic.com>
- Date
- Feb 11, 2009, 16:18 UTC
- Message-ID
- <1234369132-22063-1-git-send-email-ted@tedpavlic.com>
- In-Reply-To
- <1234366634-17900-4-git-send-email-ted@tedpavlic.com>
Several functions make use of "test -n" and "test -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> ---
This patch depends on:
<1234366634-17900-3-git-send-email-ted@tedpavlic.com>
"[PATCH 2/3] completion: Change "if [...]" to "if test ..." to
match git convention"If that patch is not applied, I can submit a new patch.
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 ffde82a..055e4ac 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -62,7 +62,7 @@ esac __gitdir () { if test -z "${1-}"; then - if test -n "$__git_dir"; then + if test -n "${__git_dir-}"; then echo "$__git_dir" elif test -d .git; then echo .git @@ -294,7 +294,7 @@ __git_remotes () __git_merge_strategies () { - if test -n "$__git_merge_strategylist"; then + if test -n "${__git_merge_strategylist-}"; then echo "$__git_merge_strategylist" return fi @@ -380,7 +380,7 @@ __git_complete_revlist () __git_all_commands () { - if test -n "$__git_all_commandlist"; then + if test -n "${__git_all_commandlist-}"; then echo "$__git_all_commandlist" return fi @@ -398,7 +398,7 @@ __git_all_commandlist="$(__git_all_commands 2>/dev/null)" __git_porcelain_commands () { - if test -n "$__git_porcelain_commandlist"; then + if test -n "${__git_porcelain_commandlist-}"; then echo "$__git_porcelain_commandlist" return fi
-- 1.6.1.2.390.gba743