Merge pull request #126 from frediz/fix-diff-execute-command

Fix forgit::diff's fzf execute because of undefined $cmd
This commit is contained in:
Chris Apple 2020-12-03 10:08:23 -08:00 committed by GitHub
commit 1397e6904b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -69,14 +69,13 @@ function forgit::diff -d "git diff viewer"
end
set repo (git rev-parse --show-toplevel)
set cmd "echo {} |sed 's/.*] //' | xargs -I% git diff --color=always $commit -- '$repo/%' | $forgit_diff_pager"
set opts "
$FORGIT_FZF_DEFAULT_OPTS
+m -0 --bind=\"enter:execute($cmd |env LESS='-r' less)\"
$FORGIT_DIFF_FZF_OPTS
"
set cmd "echo {} |sed 's/.*] //' | xargs -I% git diff --color=always $commit -- '$repo/%' | $forgit_diff_pager"
eval "git diff --name-only $commit -- $files*| sed -E 's/^(.)[[:space:]]+(.*)\$/[\1] \2/'" | env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd"
end