From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Apr 2024 17:00:08 +0000 (-0700)
Subject: Merge branch 'vs/complete-with-set-u-fix'
X-Git-Tag: v2.45.0-rc0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4a1453ad173c61663dceed2452d21616ee46b44;p=thirdparty%2Fgit.git

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

a4a1453ad173c61663dceed2452d21616ee46b44