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

fixed git diff preview fish

Browse source
This commit is contained in:
Christopher Apple 2020-04-09 09:18:27 -07:00
parent a5da0127c7
commit 2f2122bd59
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
forgit.plugin.fish
View file

@ -56,7 +56,7 @@ end
## git diff viewer
function forgit::diff
forgit::inside_work_tree || return 1
if not count $argv > /dev/null
if count $argv > /dev/null
if git rev-parse "$1" > /dev/null 2>&1
#set commit "$1" && set files ("${@:2}")
set commit "$1" && set files "$2"
@ -65,19 +65,16 @@ function forgit::diff
end
end
set repo "(git rev-parse --show-toplevel)"
set target "\(echo {} | sed 's/.*] //')"
set cmd "echo {} |sed 's/.*] //' |xargs -I% git diff --color=always $commit -- '$repo/%' |$forgit_pager"
set repo (git rev-parse --show-toplevel)
set opts "
$FORGIT_FZF_DEFAULT_OPTS
+m -0 --bind=\"enter:execute($cmd |env LESS='-R' less)\"
$FORGIT_DIFF_FZF_OPTS
"
set cmd "echo" && type -q realpath > /dev/null 2>&1 && set cmd "realpath --relative-to=."
set git_rev_parse (git rev-parse --show-toplevel)
eval "git diff --name-only $commit -- $files*| sed -E 's/^(.)[[:space:]]+(.*)\$/[\1] \2/'" |
env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd"
set cmd "echo {} |sed 's/.*] //' | xargs -I% git diff --color=always $commit -- '$repo/%' | $forgit_pager"
eval "git diff --name-only $commit -- $files*| sed -E 's/^(.)[[:space:]]+(.*)\$/[\1] \2/'" | env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd"
end
# git add selector