]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7949837 34d8f5a)
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)
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

1  2 
contrib/completion/git-prompt.sh patch | diff1 | diff2 | blob | history

diff --cc contrib/completion/git-prompt.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.