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

fish_git_prompt: Count type changes as dirty too

Browse Source 
Fixes #10305
This commit is contained in:
Fabian Boehm 2024-02-17 08:33:53 +01:00
parent b687ef036b
commit 8667ed5c17
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/functions/fish_git_prompt.fish
View File

@ -299,9 +299,9 @@ function fish_git_prompt --description "Prompt function for Git"
# 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)
set dirtystate (string match -qr '^.[ACDMRT]' -- $stat; and echo 1)
if test -n "$sha"
set stagedstate (string match -qr '^[ACDMR].' -- $stat; and echo 1)
set stagedstate (string match -qr '^[ACDMRT].' -- $stat; and echo 1)
else
set invalidstate 1
end
@ -422,8 +422,8 @@ function __fish_git_prompt_informative_status
# The v2 format is better, but we don't actually care in this case.
set -l stats (string sub -l 2 (git -c core.fsmonitor= status --porcelain -z $untr | string split0))
set -l invalidstate (string match -r '^UU' $stats | count)
set -l stagedstate (string match -r '^[ACDMR].' $stats | count)
set -l dirtystate (string match -r '^.[ACDMR]' $stats | count)
set -l stagedstate (string match -r '^[ACDMRT].' $stats | count)
set -l dirtystate (string match -r '^.[ACDMRT]' $stats | count)
set -l untrackedfiles (string match -r '^\?\?' $stats | count)
set -l info