threads / bug / 59060

BUG: git prompt breaks with zsh < 5.0.6

Subject: BUG: git prompt breaks with zsh < 5.0.6

## tl;dr

3 messages between Jan 9, 2023 and Jan 10, 2023.

replies: 2people: 2as markdown or json

Shupak, Vitaly· Jan 9, 2023, 17:12 UTC · lore
A change to git-prompt.sh in v2.38 to show presence of unresolved conflicts contains syntax which is not valid under zsh < 5.0.6. This version of zsh is old, but is still the default on RedHat 7 machines, for example.
The offending block is:
       local conflict="" # state indicator for unresolved conflicts
       if [[ "${GIT_PS1_SHOWCONFLICTSTATE}" == "yes" ]] &&
          [[ $(git ls-files --unmerged 2>/dev/null) ]]; then
               conflict="|CONFLICT"
       fi
[[ $(command) ]] syntax doesn't work in older version of zsh and should use [[ -n "$(command)" ]] instead.

Thanks, Vitaly

brian m. carlson· Jan 9, 2023, 23:37 UTC · re: Shupak, Vitaly · lore

Re: BUG: git prompt breaks with zsh < 5.0.6

On 2023-01-09 at 17:12:56, Shupak, Vitaly wrote:
Show 11 quoted lines
> A change to git-prompt.sh in v2.38 to show presence of unresolved conflicts contains syntax which is not valid under zsh < 5.0.6. This version of zsh is old, but is still the default on RedHat 7 machines, for example.
> 
> The offending block is:
> 
>        local conflict="" # state indicator for unresolved conflicts
>        if [[ "${GIT_PS1_SHOWCONFLICTSTATE}" == "yes" ]] &&
>           [[ $(git ls-files --unmerged 2>/dev/null) ]]; then
>                conflict="|CONFLICT"
>        fi
> 
> [[ $(command) ]] syntax doesn't work in older version of zsh and should use [[ -n "$(command)" ]] instead.

Does [ "$(command)" ] work? I would assume so, because that's in POSIX. If so, that might also be a valid approach since it doesn't look like we need the special behaviour of the double-bracket operator.

-- 
brian m. carlson (he/him or they/them)
Toronto, Ontario, CA
Shupak, Vitaly· Jan 10, 2023, 15:15 UTC · re: brian m. carlson · lore

RE: BUG: git prompt breaks with zsh < 5.0.6

Yes, that works too
-----Original Message-----
From: brian m. carlson <sandals@crustytoothpaste.net> 
Sent: Monday, January 9, 2023 6:37 PM
To: Shupak, Vitaly <Vitaly.Shupak@deshaw.com>
Cc: git@vger.kernel.org
Subject: Re: BUG: git prompt breaks with zsh < 5.0.6
On 2023-01-09 at 17:12:56, Shupak, Vitaly wrote:
Show 11 quoted lines
> A change to git-prompt.sh in v2.38 to show presence of unresolved conflicts contains syntax which is not valid under zsh < 5.0.6. This version of zsh is old, but is still the default on RedHat 7 machines, for example.
> 
> The offending block is:
> 
>        local conflict="" # state indicator for unresolved conflicts
>        if [[ "${GIT_PS1_SHOWCONFLICTSTATE}" == "yes" ]] &&
>           [[ $(git ls-files --unmerged 2>/dev/null) ]]; then
>                conflict="|CONFLICT"
>        fi
> 
> [[ $(command) ]] syntax doesn't work in older version of zsh and should use [[ -n "$(command)" ]] instead.

Does [ "$(command)" ] work? I would assume so, because that's in POSIX. If so, that might also be a valid approach since it doesn't look like we need the special behaviour of the double-bracket operator. -- brian m. carlson (he/him or they/them) Toronto, Ontario, CA

← back to recent threads