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

Don't error if in .git directory of git repo

Browse Source
This commit is contained in:
Ilan Cosman 2021-02-09 15:54:01 -08:00
parent 763cec1a80
commit 5091eb60ca
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
functions/_tide_item_git.fish
View File

@ -1,8 +1,20 @@
function _tide_item_git function _tide_item_git
# Branch or SHA # Branch or SHA
set -l location (git branch --show-current 2>/dev/null) || return set -l branch (git branch --show-current 2>/dev/null) || return
# --quiet ensures that it won't complain if there are no commits # --quiet ensures that it won't complain if there are no commits
git rev-parse --git-dir --short=8 --quiet HEAD | read --local --line gitDir sha git rev-parse --quiet \
--is-inside-work-tree \
--git-dir \
--short=8 HEAD | read --local --line isInsideWorkTree gitDir sha
set -l location
if test "$isInsideWorkTree" = false
set location GIT_DIR!
else if test -n "$branch"
set location $branch
else
set location $sha…
end
# Operation # Operation
set -l operation set -l operation
@ -43,22 +55,23 @@ function _tide_item_git
test "$upstreamBehind" = 0 && set -e upstreamBehind test "$upstreamBehind" = 0 && set -e upstreamBehind
test "$upstreamAhead" = 0 && set -e upstreamAhead test "$upstreamAhead" = 0 && set -e upstreamAhead
# Git status info # Git status/stash
set -l gitInfo (git status --porcelain) set -l staged
set -l staged (string match --regex '^[ADMR] ' $gitInfo | count) || set -e staged set -l dirty
set -l dirty (string match --regex '^ [ADMR]' $gitInfo | count) || set -e dirty set -l untracked
set -l untracked (string match --regex '^\?\?' $gitInfo | count) || set -e untracked set -l conflicted
set -l conflicted (string match --regex '^UU' $gitInfo | count) || set -e conflicted set -l stash
# Stash if test "$isInsideWorkTree" = true
set -l stash (git stash list | count) || set -e stash set -l gitInfo (git status --porcelain)
set staged (string match --regex '^[ADMR] ' $gitInfo | count) || set -e staged
# Print the information set dirty (string match --regex '^ [ADMR]' $gitInfo | count) || set -e dirty
if test -z "$location" set untracked (string match --regex '^\?\?' $gitInfo | count) || set -e untracked
printf '%s' '@' set conflicted (string match --regex '^UU' $gitInfo | count) || set -e conflicted
set location $sha set stash (git stash list | count) || set -e stash
end end
# Print the information
printf '%s' \ printf '%s' \
(set_color $tide_git_branch_color) $location \ (set_color $tide_git_branch_color) $location \
(set_color $tide_git_operation_color) ' '$operation ' '$step/$totalSteps \ (set_color $tide_git_operation_color) ' '$operation ' '$step/$totalSteps \