mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-10 10:46:08 +02:00
Code

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
parent e7ae437ac1 e8882a87d9
commit cfa7ae8b6e
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

@ -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 ()
fi
if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
[ "$(git config --bool core.sparseCheckout)" == "true" ]; then
[ "$(git config --bool core.sparseCheckout)" = "true" ]; then
h="?"
fi