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

Merge pull request #197 from petertriho/master

Browse source 
fix: `forgit::rebase` not working in fish
This commit is contained in:
Chris Apple 2022-04-10 07:23:36 -07:00 committed by GitHub
parent eed197948c 33ad0ea71e
commit fa9fd62439
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -374,7 +374,7 @@ function forgit::rebase -d "git rebase"
else
set graph ""
end
set preview "git log $graph --color=always --format='$forgit_log_format' $argv $forgit_emojify"
set cmd "git log $graph --color=always --format='$forgit_log_format' $argv $forgit_emojify"
set files (echo $argv | sed -nE 's/.* -- (.*)/\1/p')
set preview "echo {} |grep -Eo '[a-f0-9]+' |head -1 |xargs -I% git show --color=always % -- $files | $forgit_show_pager"
@ -392,7 +392,7 @@ function forgit::rebase -d "git rebase"
--preview=\"$preview\"
$FORGIT_REBASE_FZF_OPTS
"
set commit (eval "$preview" | FZF_DEFAULT_OPTS="$opts" fzf |
set commit (eval "$cmd" | FZF_DEFAULT_OPTS="$opts" fzf |
grep -Eo '[a-f0-9]+' | head -1)
if test $commit