From: Ville Skyttä Date: Mon, 1 Apr 2024 11:30:33 +0000 (+0000) Subject: completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode X-Git-Tag: v2.45.0-rc0~33^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=758b4e137349b8548ada07346ab82e82079b43a3;p=thirdparty%2Fgit.git completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode `GIT_PS1_SHOWCONFLICTSTATE` is a user variable that might not be set, causing errors when the shell is in `nounset` mode. Take into account on access by falling back to an empty string. Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 71f179cba3..3826f52dec 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -528,7 +528,7 @@ __git_ps1 () fi 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 conflict="|CONFLICT" fi