Merge branch 'vs/prompt-avoid-unset-variable'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:47 +0000 (09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:47 +0000 (09:56 -0700)
commitbe099661f41e661eac8af2b4879a84a9eb9a7b9b
tree5ad88ee762575674b547ead40484e80432454772
parent3873075a1238d4d4c9b9b0667bb421db0e77df91
parent34d8f5a8aa4aa17af3158f325173eb08c9c05eb1
Merge branch 'vs/prompt-avoid-unset-variable'

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