Home » Mailing list archives » git » 2009 » February » 11

[PATCH 4/3] completion: More fixes to prevent unbound variable errors.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Ted Pavlic
Subject: [PATCH 4/3] completion: More fixes to prevent unbound variable errors.
Date: Wednesday, February 11, 2009 - 9:18 am

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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/3] completion: Convention updates and DIRTYSTATE fix, Ted Pavlic, (Wed Feb 11, 8:37 am)
[PATCH 1/3] completion: For consistency, changed &quot;git rev- ..., Ted Pavlic, (Wed Feb 11, 8:37 am)
[PATCH 2/3] completion: Change &quot;if [...]&quot; to &quot;if test ...&quot; ..., Ted Pavlic, (Wed Feb 11, 8:37 am)
[PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE from b ..., Ted Pavlic, (Wed Feb 11, 8:37 am)
[PATCH 4/3] completion: More fixes to prevent unbound vari ..., Ted Pavlic, (Wed Feb 11, 9:18 am)
Re: [PATCH 1/3] completion: For consistency, changed &quot;git ..., Shawn O. Pearce, (Wed Feb 11, 9:22 am)
Re: [PATCH 2/3] completion: Change &quot;if [...]&quot; to &quot;if test ..., Shawn O. Pearce, (Wed Feb 11, 9:24 am)
Re: [PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE fr ..., Shawn O. Pearce, (Wed Feb 11, 9:26 am)
Re: [PATCH 4/3] completion: More fixes to prevent unbound ..., Shawn O. Pearce, (Wed Feb 11, 9:28 am)
Re: [PATCH 2/3] completion: Change &quot;if [...]&quot; to &quot;if test ..., Ted Pavlic, (Wed Feb 11, 9:36 am)
Re: [PATCH 2/3] completion: Change &quot;if [...]&quot; to &quot;if test ..., Junio C Hamano, (Wed Feb 11, 9:46 am)
Re: [PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE fr ..., Ted Pavlic, (Wed Feb 11, 9:53 am)
Re: [PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE fr ..., Junio C Hamano, (Wed Feb 11, 9:56 am)
Re: [PATCH 2/3] completion: Change &quot;if [...]&quot; to &quot;if test ..., Junio C Hamano, (Wed Feb 11, 10:14 am)
Re: [PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE fr ..., Ted Pavlic, (Wed Feb 11, 10:20 am)
Re: [PATCH 3/3] completion: Prevents GIT_PS1_DIRTYSTATE fr ..., Shawn O. Pearce, (Wed Feb 11, 11:01 am)