From: Junio C Hamano <redacted>
Date: Mon, 27 Jun 2016 16:56:47 +0000 (-0700)
Subject: Merge branch 'vs/prompt-avoid-unset-variable'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=be099661f41e661eac8af2b4879a84a9eb9a7b9b;p=git.git

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

be099661f41e661eac8af2b4879a84a9eb9a7b9b