Merge branch 'en/sparse-status' into master

Fix to a "git prompt" regression during this development cycle.

* en/sparse-status:
  git-prompt: change == to = for zsh's sake
This commit is contained in:
Junio C Hamano 2020-07-21 14:19:09 -07:00
commit cfa7ae8b6e

View File

@ -433,7 +433,7 @@ __git_ps1 ()
local sparse="" local sparse=""
if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] && if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
[ -z "${GIT_PS1_OMITSPARSESTATE}" ] && [ -z "${GIT_PS1_OMITSPARSESTATE}" ] &&
[ "$(git config --bool core.sparseCheckout)" == "true" ]; then [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
sparse="|SPARSE" sparse="|SPARSE"
fi fi
@ -542,7 +542,7 @@ __git_ps1 ()
fi fi
if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] && if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
[ "$(git config --bool core.sparseCheckout)" == "true" ]; then [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
h="?" h="?"
fi fi