Browse Source

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
maint
Junio C Hamano 5 years ago
parent
commit
cfa7ae8b6e
  1. 4
      contrib/completion/git-prompt.sh

4
contrib/completion/git-prompt.sh

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

@ -542,7 +542,7 @@ __git_ps1 () @@ -542,7 +542,7 @@ __git_ps1 ()
fi

if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
[ "$(git config --bool core.sparseCheckout)" == "true" ]; then
[ "$(git config --bool core.sparseCheckout)" = "true" ]; then
h="?"
fi


Loading…
Cancel
Save