From 9320fb52bb9721e99153d347f8f89639b78d85a7 Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Mon, 6 May 2024 19:17:26 +0200 Subject: [PATCH] git prompt: Check for "U"nmerged files Fixes #10481 --- share/functions/fish_git_prompt.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish index 866c0ef39..98e4b66e4 100644 --- a/share/functions/fish_git_prompt.fish +++ b/share/functions/fish_git_prompt.fish @@ -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 '^.[ACDMRT]' -- $stat; and echo 1) + set dirtystate (string match -qr '^.[ACDMRTU]' -- $stat; and echo 1) 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 set invalidstate 1 end