]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'vs/complete-with-set-u-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Apr 2024 17:00:08 +0000 (10:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Apr 2024 17:00:08 +0000 (10:00 -0700)
Another "set -u" fix for the bash prompt (in contrib/) script.

* vs/complete-with-set-u-fix:
  completion: protect prompt against unset SHOWUPSTREAM in nounset mode
  completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode


Trivial merge