diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-21 21:19:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-21 21:19:10 (GMT) |
| commit | cfa7ae8b6e2f375d3609e526754539ef0791d33b (patch) | |
| tree | 0bb7c5ddfda578a92506fc73bc3231c13859ebb9 /contrib | |
| parent | e7ae437ac19eb0e82739d82cc886221252689ff4 (diff) | |
| parent | e8882a87d9c479fd9d6e71a5840e949579304ab9 (diff) | |
| download | git-cfa7ae8b6e2f375d3609e526754539ef0791d33b.zip git-cfa7ae8b6e2f375d3609e526754539ef0791d33b.tar.gz git-cfa7ae8b6e2f375d3609e526754539ef0791d33b.tar.bz2 | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index e6cd546..16260ba 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -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 |