IlanCosman/tide
1
1
Fork 0
mirror of https://github.com/IlanCosman/tide.git synced 2024-12-23 12:03:48 +03:00
Code Issues Projects Releases Wiki Activity

Minor edits

Browse Source
This commit is contained in:
Ilan Cosman 2021-09-27 11:21:19 -07:00
parent 6b26c69da8
commit 049074e2a3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
functions/_tide_item_git.fish
View File

@ -1,8 +1,7 @@
function _tide_item_git function _tide_item_git
set -l location $_tide_location_color(git branch --show-current 2>/dev/null) || return set -l location $_tide_location_color(git branch --show-current 2>/dev/null) || return
# --quiet = don't error if there are no commits # --quiet = don't error if there are no commits
git rev-parse --quiet --git-dir --is-inside-git-dir --short HEAD | git rev-parse --quiet --git-dir --is-inside-git-dir --short HEAD | read -l --line git_dir inside_git_dir sha
read --local --line git_dir is_inside_git_dir sha
if test -z "$location" # Default to branch, then tag, then sha if test -z "$location" # Default to branch, then tag, then sha
set location '#'$_tide_location_color(git tag --points-at HEAD)[1] # get the first tag set location '#'$_tide_location_color(git tag --points-at HEAD)[1] # get the first tag
@ -39,15 +38,15 @@ function _tide_item_git
end end
# Upstream behind/ahead. Suppress errors in case there is no upstream # Upstream behind/ahead. Suppress errors in case there is no upstream
git rev-list --count --left-right @{upstream}...HEAD 2>/dev/null | read --local --delimiter=\t behind ahead git rev-list --count --left-right @{upstream}...HEAD 2>/dev/null | read -l --delimiter=\t behind ahead
test "$behind" = 0 && set -e behind test "$behind" = 0 && set behind
test "$ahead" = 0 && set -e ahead test "$ahead" = 0 && set ahead
# Git status/stash # Git status/stash
test "$is_inside_git_dir" = true && set -l tide_git_set_dir_option -C $git_dir/.. test "$inside_git_dir" = true && set -l _set_dir_opt -C $git_dir/..
# Suppress errors in case we are in a bare repo # Suppress errors in case we are in a bare repo
set -l git_info (git $tide_git_set_dir_option --no-optional-locks status --porcelain 2>/dev/null) set -l git_info (git $_set_dir_opt --no-optional-locks status --porcelain 2>/dev/null)
set -l data (git $tide_git_set_dir_option stash list 2>/dev/null | count set -l data (git $_set_dir_opt stash list 2>/dev/null | count
string match --regex '^UU' $git_info | count string match --regex '^UU' $git_info | count
string match --regex '^[ADMR].' $git_info | count string match --regex '^[ADMR].' $git_info | count
string match --regex '^.[ADMR]' $git_info | count string match --regex '^.[ADMR]' $git_info | count