]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commita4a1453ad173c61663dceed2452d21616ee46b44
treecffc4fd11fa5a504d73e1df7602831dc16392a3d
parentaaf524cfb0707c28c3f9a08598a33abf11b24435
parentd7805bc74351e61126e587a7470e3fbf843caf8a
Merge branch 'vs/complete-with-set-u-fix'

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