From: Junio C Hamano <gitster@pobox.com>
To: "Ville Skyttä" <ville.skytta@iki.fi>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
Date: Mon, 06 Jun 2016 13:08:32 -0700 [thread overview]
Message-ID: <xmqq37oqw05b.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1465230573-18357-1-git-send-email-ville.skytta@iki.fi> ("Ville Skyttä"'s message of "Mon, 6 Jun 2016 19:29:33 +0300")
Ville Skyttä <ville.skytta@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, and initialize $short_sha before use.
>
> Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
> ---
Thanks for following up. I do not run my interactive shells with
"set -u", so I never noticed these, but apparently you do (or you
know who does)--does this patch cover everything that is not "-u"
safe?
Will queue.
> contrib/completion/git-prompt.sh | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
> index 64219e6..97eacd7 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 \
> @@ -368,7 +368,7 @@ __git_ps1 ()
> return $exit
> fi
>
> - local short_sha
> + local short_sha=""
> if [ "$rev_parse_exit_code" = "0" ]; then
> short_sha="${repo_info##*$'\n'}"
> repo_info="${repo_info%$'\n'*}"
next prev parent reply other threads:[~2016-06-06 20:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 16:29 [PATCH 1/2] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha Ville Skyttä
2016-06-06 20:08 ` Junio C Hamano [this message]
2016-06-07 5:22 ` Ville Skyttä
-- strict thread matches above, loose matches on Subject: below --
2016-06-06 16:33 Ville Skyttä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq37oqw05b.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ville.skytta@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).