Elijah Newren <newren@xxxxxxxxx> writes:
> Yeah, I accidentally was relying on undefined-translates-to-empty,
> which breaks under set -u. I can duplicate the precise error, and
> your fix below is exactly how I fixed it too, before seeing you posted
> the same fix.
>
> I'll post a patch with you as author...and some questions on what to
> do with the rest of the commit message and attribution tags.
Nah, please take full credit for it. It is more work to test the
result of the change than just running a grep and coming up with "I
wonder if this would work...".
Thanks for a sanity check.
>
>> Thanks.
>>
>> contrib/completion/git-prompt.sh | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git i/contrib/completion/git-prompt.sh w/contrib/completion/git-prompt.sh
>> index 4640a1535d..b9485f4016 100644
>> --- i/contrib/completion/git-prompt.sh
>> +++ w/contrib/completion/git-prompt.sh
>> @@ -139,7 +139,7 @@ __git_ps1_show_upstream ()
>>
>> # parse configuration values
>> local option
>> - for option in ${GIT_PS1_SHOWUPSTREAM}; do
>> + for option in ${GIT_PS1_SHOWUPSTREAM-}; do
>> case "$option" in
>> git|svn) upstream="$option" ;;
>> verbose) verbose=1 ;;
>> @@ -433,8 +433,8 @@ __git_ps1 ()
>> fi
>>
>> local sparse=""
>> - if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
>> - [ -z "${GIT_PS1_OMITSPARSESTATE}" ] &&
>> + if [ -z "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
>> + [ -z "${GIT_PS1_OMITSPARSESTATE-}" ] &&
>> [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
>> sparse="|SPARSE"
>> fi
>> @@ -543,7 +543,7 @@ __git_ps1 ()
>> u="%${ZSH_VERSION+%}"
>> fi
>>
>> - if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
>> + if [ -n "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
>> [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
>> h="?"
>> fi
