"David J. Malan via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> From: "David J. Malan" <malan@xxxxxxxxxxx>
> Subject: Re: [PATCH] git-prompt: changes == to = for zsh's sake
s/changes/change/
> When using git-prompt.sh with Zsh, __git_ps1 currently errs
> when inside a repo with:
>
> __git_ps1:96: = not found
OK.
> This commit changes `==` to `=` for both Bash and Zsh.
We prefer to see "why" instead of "what", as the latter can easily
be read from the patch text.
Avoid using non-portable "==" that is only understood by bash
and not zsh to "="; that way the prompt script becomes usable
with zsh again.
or something like that.
Elijah, I think this is a minor regression in this cycle, and the
fix is obvious enough that it deserves to be in the upcoming
release. Agreed?
Thank you, David, for a fix.
> Signed-off-by: David J. Malan <malan@xxxxxxxxxxx>
> ---
> Changes == to = for zsh's sake in git-prompt.sh
>
> Upon installing git-prompt.sh
> [https://github.com/gitgitgadget/git/blob/master/contrib/completion/git-prompt.sh]
> on macOS Catalina, I noticed that
> https://github.com/gitgitgadget/git/commit/afda36dbf3b4f5a489ab44c00d5210c1fa894a40
> seems to have introduced an issue for Zsh whereby __git_ps1 errs with
>
> __git_ps1:96: = not found
>
> when inside a repo. Changing == to = would seem to address for both Bash
> and Zsh.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-679%2Fdmalan%2Fpatch-1-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-679/dmalan/patch-1-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/679
>
> contrib/completion/git-prompt.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
> index e6cd5464e5..16260bab73 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
>
>
> base-commit: ae46588be0cd730430dded4491246dfb4eac5557
