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

Bring back is-inside-git-dir (fixes #290)

Browse Source
This commit is contained in:
Ilan Cosman 2022-04-22 07:59:11 -07:00
parent fd7f542fe3
commit 6e10b89fc0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
functions/_tide_item_git.fish
View File

@ -1,14 +1,14 @@
function _tide_item_git function _tide_item_git
if git branch --show-current 2>/dev/null | string replace -r "(.{$tide_git_truncation_length}).+" '$1…' | read -l location if git branch --show-current 2>/dev/null | string replace -r "(.{$tide_git_truncation_length}).+" '$1…' | read -l location
git rev-parse --git-dir | read -f git_dir git rev-parse --git-dir --is-inside-git-dir | read -fL git_dir inside_git_dir
set location $_tide_location_color$location set location $_tide_location_color$location
else if test $pipestatus[1] != 0 else if test $pipestatus[1] != 0
return return
else if git tag --points-at HEAD | string replace -r "(.{$tide_git_truncation_length}).+" '$1…' | read location else if git tag --points-at HEAD | string replace -r "(.{$tide_git_truncation_length}).+" '$1…' | read location
git rev-parse --git-dir | read -f git_dir git rev-parse --git-dir --is-inside-git-dir | read -fL git_dir inside_git_dir
set location '#'$_tide_location_color$location set location '#'$_tide_location_color$location
else else
git rev-parse --git-dir --short HEAD | read -fL git_dir location git rev-parse --git-dir --is-inside-git-dir --short HEAD | read -fL git_dir inside_git_dir location
set location @$_tide_location_color$location set location @$_tide_location_color$location
end end
@ -38,11 +38,12 @@ function _tide_item_git
end end
# Git status/stash + Upstream behind/ahead # Git status/stash + Upstream behind/ahead
test $inside_git_dir = true && set -l _set_dir_opt -C $git_dir/..
# Suppress errors in case we are in a bare repo or there is no upstream # Suppress errors in case we are in a bare repo or there is no upstream
git_info=(git -C $git_dir/.. --no-optional-locks status --porcelain 2>/dev/null) \ git_info=(git $_set_dir_opt --no-optional-locks status --porcelain 2>/dev/null) \
string match -qr '(0|(?<stash>.*))\n(0|(?<conflicted>.*))\n(0|(?<staged>.*)) string match -qr '(0|(?<stash>.*))\n(0|(?<conflicted>.*))\n(0|(?<staged>.*))
(0|(?<dirty>.*))\n(0|(?<untracked>.*))(\n(0|(?<behind>.*))\t(0|(?<ahead>.*)))?' \ (0|(?<dirty>.*))\n(0|(?<untracked>.*))(\n(0|(?<behind>.*))\t(0|(?<ahead>.*)))?' \
"$(git -C $git_dir/.. stash list 2>/dev/null | count "$(git $_set_dir_opt stash list 2>/dev/null | count
string match -r ^UU $git_info | count string match -r ^UU $git_info | count
string match -r ^[ADMR]. $git_info | count string match -r ^[ADMR]. $git_info | count
string match -r ^.[ADMR] $git_info | count string match -r ^.[ADMR] $git_info | count