Ville Skyttä <ville.sky...@iki.fi> writes:

> When the shell is in "nounset" or "set -u" mode, referencing unset or
> null variables results in an error. Protect $ZSH_VERSION and
> $BASH_VERSION against that.
>
> Signed-off-by: Ville Skyttä <ville.sky...@iki.fi>
> ---

Makes sense from a cursory look.  Thanks.

>  contrib/completion/git-prompt.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/completion/git-prompt.sh 
> b/contrib/completion/git-prompt.sh
> index 64219e6..341cf6b 100644
> --- a/contrib/completion/git-prompt.sh
> +++ b/contrib/completion/git-prompt.sh
> @@ -355,8 +355,8 @@ __git_ps1 ()
>       # incorrect.)
>       #
>       local ps1_expanded=yes
> -     [ -z "$ZSH_VERSION" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no
> -     [ -z "$BASH_VERSION" ] || shopt -q promptvars || ps1_expanded=no
> +     [ -z "${ZSH_VERSION-}" ] || [[ -o PROMPT_SUBST ]] || ps1_expanded=no
> +     [ -z "${BASH_VERSION-}" ] || shopt -q promptvars || ps1_expanded=no
>  
>       local repo_info rev_parse_exit_code
>       repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to