Re: [PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION

From: Junio C Hamano <gitster@pobox.com>
Date: May 24, 2016, 17:11 UTC
Message-ID: <xmqqwpmj5qjx.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1464078713-3220-1-git-send-email-ville.skytta@iki.fi>

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

Show 6 quoted lines

> 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.skytta@iki.fi>
> ---

Makes sense from a cursory look.  Thanks.

Show 18 quoted lines

>  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 \