github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 11:22:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fish_git_prompt: only do macOS workarounds for /usr/bin/git

Browse Source 
On macOS, fish_git_prompt was failing to correctly handle the case where
another git was installed, e.g. /usr/local/bin/git from Homebrew.
Disable the workarounds in that case.
This commit is contained in:
ridiculousfish 2023-01-02 12:23:50 -08:00
parent ad46dacdad
commit 700eeb7785
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/functions/fish_git_prompt.fish
View File

@ -170,8 +170,8 @@ end
# Decide if git is safe to run.
# On Darwin, git is pre-installed as a stub, which will pop a dialog if you run it.
if string match -q Darwin -- "$(uname)" && type -q xcode-select && type -q xcrun
if string match -q /usr/bin/git -- "$(command -s git)" && not xcode-select --print-path &>/dev/null
if string match -q Darwin -- "$(uname)" && string match -q /usr/bin/git -- "$(command -s git)" && type -q xcode-select && type -q xcrun
if not xcode-select --print-path &>/dev/null
# Only the stub git is installed.
# Do not try to run it.
function __fish_git_prompt_ready