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

Fix Git status in Acidhub prompt

Browse Source 
Fix 1: The --quiet flag must be at the end of the command. The way it was I would never get any status symbol in my prompt as the command failed.
Fix 2: After adding files to git, but before committing them, git status is unsorted. This gave me the output "M A M A" after `uniq`, which resulted in 4 status symbols instead of 2. Sorting them before filtering them fixed the problem.
This commit is contained in:
Henrik Hermansen
2021-01-13 11:35:14 +01:00
committed by Fabian Homborg
parent c76074b1d6
commit eaf7431c38
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/tools/web_config/sample_prompts/acidhub.fish
View File

@@ -8,7 +8,7 @@ function fish_prompt -d "Write out the prompt"
if set -l git_branch (command git symbolic-ref HEAD 2>/dev/null | string replace refs/heads/ '')
set git_branch (set_color -o blue)"$git_branch"
set -l git_status
if command git diff-index --quiet HEAD --
if command git diff-index HEAD -- --quiet
if set -l count (command git rev-list --count --left-right $upstream...HEAD 2>/dev/null)
echo $count | read -l ahead behind
if test "$ahead" -gt 0
@@ -18,7 +18,7 @@ function fish_prompt -d "Write out the prompt"
set git_status "$git_status"(set_color red)⬇
end
end
for i in (git status --porcelain | string sub -l 2 | uniq)
for i in (git status --porcelain | string sub -l 2 | sort | uniq)
switch $i
case "."
set git_status "$git_status"(set_color green)✚