From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:06:38 +0000 (-0700)
Subject: Merge branch 'vs/prompt-avoid-unset-variable' into maint
X-Git-Tag: v2.9.1~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8162401fb0ab16addc6e003a93b8d195cce3fad4?ds=inline;hp=-c

Merge branch 'vs/prompt-avoid-unset-variable' into maint

The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.

* vs/prompt-avoid-unset-variable:
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
---

8162401fb0ab16addc6e003a93b8d195cce3fad4
diff --combined contrib/completion/git-prompt.sh
index 64219e631a,ba599fc4a1..97eacd7832
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@@ -355,8 -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 +368,7 @@@
  		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'*}"
@@@ -476,9 -476,10 +476,9 @@@
  		if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
  		   [ "$(git config --bool bash.showDirtyState)" != "false" ]
  		then
 -			git diff --no-ext-diff --quiet --exit-code || w="*"
 -			if [ -n "$short_sha" ]; then
 -				git diff-index --cached --quiet HEAD -- || i="+"
 -			else
 +			git diff --no-ext-diff --quiet || w="*"
 +			git diff --no-ext-diff --cached --quiet || i="+"
 +			if [ -z "$short_sha" ] && [ -z "$i" ]; then
  				i="#"
  			fi
  		fi
@@@ -490,7 -491,7 +490,7 @@@
  
  		if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
  		   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
 -		   git ls-files --others --exclude-standard --error-unmatch -- ':/*' >/dev/null 2>/dev/null
 +		   git ls-files --others --exclude-standard --directory --no-empty-directory --error-unmatch -- ':/*' >/dev/null 2>/dev/null
  		then
  			u="%${ZSH_VERSION+%}"
  		fi