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

git prompt: Check for "U"nmerged files

Browse Source 
Fixes #10481
This commit is contained in:
Fabian Boehm 2024-05-06 19:17:26 +02:00
parent 33c5cd5808
commit 9320fb52bb
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

@ -299,9 +299,9 @@ function fish_git_prompt --description "Prompt function for Git"
# Ignored files are omitted by default # Ignored files are omitted by default
set -l stat (command git -c core.fsmonitor= status --porcelain -z $opt | string split0) set -l stat (command git -c core.fsmonitor= status --porcelain -z $opt | string split0)
set dirtystate (string match -qr '^.[ACDMRT]' -- $stat; and echo 1) set dirtystate (string match -qr '^.[ACDMRTU]' -- $stat; and echo 1)
if test -n "$sha" if test -n "$sha"
set stagedstate (string match -qr '^[ACDMRT].' -- $stat; and echo 1) set stagedstate (string match -qr '^[ACDMRTU].' -- $stat; and echo 1)
else else
set invalidstate 1 set invalidstate 1
end end