kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2024-04-10 10:00:08 -07:00
parent aaf524cfb0 d7805bc743
commit a4a1453ad1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/completion/git-prompt.sh
View File

@ -141,7 +141,7 @@ __git_ps1_show_upstream ()


# parse configuration values # parse configuration values
local option local option
for option in ${GIT_PS1_SHOWUPSTREAM}; do for option in ${GIT_PS1_SHOWUPSTREAM-}; do
case "$option" in case "$option" in
git|svn) upstream_type="$option" ;; git|svn) upstream_type="$option" ;;
verbose) verbose=1 ;; verbose) verbose=1 ;;
@ -528,7 +528,7 @@ __git_ps1 ()
fi fi


local conflict="" # state indicator for unresolved conflicts local conflict="" # state indicator for unresolved conflicts
if [[ "${GIT_PS1_SHOWCONFLICTSTATE}" == "yes" ]] && if [[ "${GIT_PS1_SHOWCONFLICTSTATE-}" == "yes" ]] &&
[[ $(git ls-files --unmerged 2>/dev/null) ]]; then [[ $(git ls-files --unmerged 2>/dev/null) ]]; then
conflict="|CONFLICT" conflict="|CONFLICT"
fi fi