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

return 1 when return like in zsh

Browse source 
Former-commit-id: 9d4e17e7b4
This commit is contained in:
Ido Abramovich 2018-08-02 14:47:30 +03:00
parent 44bfa7dcfe
commit 0d728706b6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
forgit.plugin.sh
View file

@ -61,7 +61,7 @@ __forgit_get_git_color() {
# git commit browser # git commit browser
__forgit_log() { __forgit_log() {
__forgit_inside_work_tree || return __forgit_inside_work_tree || return 1
local cmd="echo {} |grep -o '[a-f0-9]\{7\}' |head -1 |xargs -I% git show --color=always % $forgit_emojify $forgit_fancy" local cmd="echo {} |grep -o '[a-f0-9]\{7\}' |head -1 |xargs -I% git show --color=always % $forgit_emojify $forgit_fancy"
eval "git log --graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $@ $forgit_emojify" | eval "git log --graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $@ $forgit_emojify" |
__forgit_fzf +s +m --tiebreak=index \ __forgit_fzf +s +m --tiebreak=index \
@ -71,7 +71,7 @@ __forgit_log() {
} }
__forgit_diff() { __forgit_diff() {
__forgit_inside_work_tree || return __forgit_inside_work_tree || return 1
local cmd="git diff --no-ext-diff --color=always -- {} $forgit_emojify $forgit_fancy" local cmd="git diff --no-ext-diff --color=always -- {} $forgit_emojify $forgit_fancy"
[[ $# -eq 0 ]] && local files=$(git rev-parse --show-toplevel) || local files="$@" [[ $# -eq 0 ]] && local files=$(git rev-parse --show-toplevel) || local files="$@"
git ls-files --modified "$files"| git ls-files --modified "$files"|
@ -81,7 +81,7 @@ __forgit_diff() {
} }
__forgit_add() { __forgit_add() {
__forgit_inside_work_tree || return __forgit_inside_work_tree || return 1
added=$(__forgit_get_git_color "color.status.untracked" "red") added=$(__forgit_get_git_color "color.status.untracked" "red")
changed=$(__forgit_get_git_color "color.status.changed" "red") changed=$(__forgit_get_git_color "color.status.changed" "red")
unmerged=$(__forgit_get_git_color "color.status.unmerged" "red") unmerged=$(__forgit_get_git_color "color.status.unmerged" "red")
@ -99,7 +99,7 @@ __forgit_add() {
__forgit_restore() { __forgit_restore() {
__forgit_inside_work_tree || return __forgit_inside_work_tree || return 1
local cmd="git diff --no-ext-diff --color=always -- {} $forgit_emojify $forgit_fancy" local cmd="git diff --no-ext-diff --color=always -- {} $forgit_emojify $forgit_fancy"
local files=$(git ls-files --modified $(git rev-parse --show-toplevel)| local files=$(git ls-files --modified $(git rev-parse --show-toplevel)|
__forgit_fzf -m -0 --preview="$cmd") __forgit_fzf -m -0 --preview="$cmd")
@ -108,7 +108,7 @@ __forgit_restore() {
} }
__forgit_clean() { __forgit_clean() {
__forgit_inside_work_tree || return __forgit_inside_work_tree || return 1
# Note: Postfix '/' in directory path should be removed. Otherwise the directory itself will not be removed. # Note: Postfix '/' in directory path should be removed. Otherwise the directory itself will not be removed.
local files=$(git clean -xdfn "$@"| awk '{print $3}'| __forgit_fzf -m -0 |sed 's#/$##') local files=$(git clean -xdfn "$@"| awk '{print $3}'| __forgit_fzf -m -0 |sed 's#/$##')
[[ -n "$files" ]] && echo "$files" |xargs -I{} git clean -xdf {} && return [[ -n "$files" ]] && echo "$files" |xargs -I{} git clean -xdf {} && return