utils-code/wfxr.forgit
1
0
Fork 0
mirror of https://github.com/wfxr/forgit.git synced 2026-09-10 07:16:23 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Do not return an error in log, diff and stash show (#236)

Browse source 
fzf has the following exit codes:
0      Normal exit
1      No match
2      Error
130    Interrupted with CTRL-C or ESC

The forgit functions "log", "diff" and "stash show" are designed to
display information, not to perform any action. Hence the fzf exit code
130 should not be interpreted as an error, it is normal exit behavior.
Exclude this error value and return 0 in this case.
This commit is contained in:
Tim 2022-09-17 18:16:30 +02:00 committed by GitHub
parent e0ca1f4045
commit 49579b2d1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
conf.d/forgit.plugin.fish
View file

@ -93,6 +93,11 @@ function forgit::log -d "git commit viewer"
eval "git log $graph --color=always --format='$log_format' $argv $forgit_emojify" |
env FZF_DEFAULT_OPTS="$opts" fzf
set fzf_exit_code $status
# exit successfully on 130 (ctrl-c/esc)
[ $fzf_exit_code = 130 ] && return 0
return $fzf_exit_code
end
function forgit::extract_file --argument-names 'path'
@ -144,6 +149,10 @@ function forgit::diff -d "git diff viewer" --argument-names arg1 arg2
expand -t 8 |
env FZF_DEFAULT_OPTS="$opts" fzf
set fzf_exit_code $status
# exit successfully on 130 (ctrl-c/esc)
[ $fzf_exit_code = 130 ] && return 0
return $fzf_exit_code
end
# git add selector
@ -347,6 +356,11 @@ function forgit::stash::show -d "git stash viewer"
$FORGIT_STASH_FZF_OPTS
"
git stash list | env FZF_DEFAULT_OPTS="$opts" fzf
set fzf_exit_code $status
# exit successfully on 130 (ctrl-c/esc)
[ $fzf_exit_code = 130 ] && return 0
return $fzf_exit_code
end
# git clean selector

12
forgit.plugin.zsh
View file

@ -53,6 +53,10 @@ forgit::log() {
log_format=${FORGIT_GLO_FORMAT:-$forgit_log_format}
eval "git log $graph --color=always --format='$log_format' $* $forgit_emojify" |
FZF_DEFAULT_OPTS="$opts" fzf
fzf_exit_code=$?
# exit successfully on 130 (ctrl-c/esc)
[[ $fzf_exit_code == 130 ]] && return 0
return $fzf_exit_code
}
# git diff viewer
@ -89,6 +93,10 @@ forgit::diff() {
eval "git diff --name-status $commits -- ${files[*]} | sed -E 's/^([[:alnum:]]+)[[:space:]]+(.*)$/[\1]\t\2/'" |
sed 's/\t/ -> /2' | expand -t 8 |
FZF_DEFAULT_OPTS="$opts" fzf
fzf_exit_code=$?
# exit successfully on 130 (ctrl-c/esc)
[[ $fzf_exit_code == 130 ]] && return 0
return $fzf_exit_code
}
# git add selector
@ -157,6 +165,10 @@ forgit::stash::show() {
$FORGIT_STASH_FZF_OPTS
"
git stash list | FZF_DEFAULT_OPTS="$opts" fzf
fzf_exit_code=$?
# exit successfully on 130 (ctrl-c/esc)
[[ $fzf_exit_code == 130 ]] && return 0
return $fzf_exit_code
}
# git clean selector