github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-18 16:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

git prompt: Simplify "staged" logic

Browse Source 
This had this weird "pass along the sha, then check" logic to it which
is entirely unnecessary.

This function just says when something is staged, nothing more. Why
that is you can figure out for yourself.

This makes it easier to call this function, and it no longer prints an
empty line if nothing is staged.
This commit is contained in:
Fabian Homborg 2020-06-20 20:12:16 +02:00
parent a6efe0f0e4
commit 63f7f1925e
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
share/functions/fish_git_prompt.fish
View File

@ -408,7 +408,11 @@ function fish_git_prompt --description "Prompt function for Git"
# This has to be set explicitly. # This has to be set explicitly.
if test "$dirty" = true if test "$dirty" = true
set w (__fish_git_prompt_dirty) set w (__fish_git_prompt_dirty)
set i (__fish_git_prompt_staged $sha) if test -n "$sha"
set i (__fish_git_prompt_staged)
else
set i $___fish_git_prompt_char_invalidstate
end
end end
if set -q __fish_git_prompt_showstashstate if set -q __fish_git_prompt_showstashstate
@ -485,23 +489,11 @@ end
### helper functions ### helper functions
function __fish_git_prompt_staged --description "fish_git_prompt helper, tells whether or not the current branch has staged files" function __fish_git_prompt_staged --description "fish_git_prompt helper, tells whether or not the current branch has staged files"
set -l sha $argv[1] # The "diff" functions all return > 0 if there _is_ a diff,
set -l staged # but we want to return 0 if there are staged changes.
set -l ret 0 # So we invert the status.
not command git diff-index --cached --quiet HEAD -- 2>/dev/null
if test -n "$sha" and echo $___fish_git_prompt_char_stagedstate
# The "diff" functions all return > 0 if there _is_ a diff,
# but we want to return 0 if there are staged changes.
# So we invert the status.
not command git diff-index --cached --quiet HEAD -- 2>/dev/null
and set staged $___fish_git_prompt_char_stagedstate
set ret $status
else
set staged $___fish_git_prompt_char_invalidstate
set ret 2
end
echo $staged
return $ret
end end
function __fish_git_prompt_untracked --description "fish_git_prompt helper, tells whether or not the current repository has untracked files" function __fish_git_prompt_untracked --description "fish_git_prompt helper, tells whether or not the current repository has untracked files"