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

Merge pull request #169 from p00f/fix_interactive_only_fish_preview

Browse source 
use fish to interpret preview command
This commit is contained in:
Wenxuan 2021-12-01 15:18:45 +08:00 committed by GitHub
parent b727321f2b b1c4c11959
commit 27d4a78756
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,10 +101,10 @@ function forgit::add -d "git add selector"
set preview "
set file (echo {} | $extract_file)
# exit
if test (git status -s -- \$file | grep '^??') # diff with /dev/null for untracked files
git diff --color=always --no-index -- /dev/null \$file | $forgit_diff_pager | sed '2 s/added:/untracked:/'
if test (git status -s -- \\\$file | grep '^??') # diff with /dev/null for untracked files
git diff --color=always --no-index -- /dev/null \\\$file | $forgit_diff_pager | sed '2 s/added:/untracked:/'
else
git diff --color=always -- \$file | $forgit_diff_pager
git diff --color=always -- \\\$file | $forgit_diff_pager
end
"
set opts "
@ -115,7 +115,7 @@ function forgit::add -d "git add selector"
set files (git -c color.status=always -c status.relativePaths=true status -su |
grep -F -e "$changed" -e "$unmerged" -e "$untracked" |
sed -E 's/^(..[^[:space:]]*)[[:space:]]+(.*)\$/[\1] \2/' | # deal with white spaces internal to fname
env FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" |
env FZF_DEFAULT_OPTS="$opts" fzf --preview="fish -c \"$preview\"" |
sh -c "$extract_file") # for rename case
if test -n "$files"