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=--cc

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