diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2016-06-06 19:29:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-06 13:09:07 -0700 |
| commit | 34d8f5a8aa4aa17af3158f325173eb08c9c05eb1 (patch) | |
| tree | 27faadbbf1553347c30e54ae3892e094f4007ca4 /contrib | |
| parent | e568e563ade00bbb0937162f405fc160f253e224 (diff) | |
| download | git-34d8f5a8aa4aa17af3158f325173eb08c9c05eb1.tar.gz git-34d8f5a8aa4aa17af3158f325173eb08c9c05eb1.tar.xz | |
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 366f0bc1e..ba599fc4a 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'*}" |