Merge branch 'vs/prompt-avoid-unset-variable' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:38 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:38 +0000 (13:06 -0700)
commit8162401fb0ab16addc6e003a93b8d195cce3fad4
tree29fb9d01b9d1259ccb1064a10d0fa521c4af2bb6
parent79498375208946f9f1fd444bdfa6abb5bb6eec40
parent34d8f5a8aa4aa17af3158f325173eb08c9c05eb1
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
contrib/completion/git-prompt.sh