h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-11 13:51:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

fish_git_prompt: drop --ignored flag in git status

Browse Source 
Arguments to --ignored were introduced in Git 2.16, from January 2018.

The git completions specifically work around this, allowing older
versions to be used; match this in the git prompt.

Fixes the tests on CentOS 7.
This commit is contained in:
David Adam
2022-06-02 13:56:35 +08:00
parent 540aea5999
commit a4749356ae
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/functions/fish_git_prompt.fish
View File

@@ -267,7 +267,9 @@ function fish_git_prompt --description "Prompt function for Git"
# With just dirty, it's ~20%.
set -l opt -uno
test "$untracked" = true; and set opt -unormal
set -l stat (command git -c core.fsmonitor= status --porcelain -z --ignored=no $opt | string split0)
# Don't use `--ignored=no`; it was introduced in Git 2.16, from January 2018
# Ignored files are omitted by default
set -l stat (command git -c core.fsmonitor= status --porcelain -z $opt | string split0)
set dirtystate (string match -qr '^.[ACDMR]' -- $stat; and echo 1)
if test -n "$sha"