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

fix: make linter happy

Browse source
This commit is contained in:
zhangwenxuan.917 2022-07-28 16:29:49 +08:00
parent 76b5d5cc86
commit 85ccdd3f80
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
forgit.plugin.zsh
View file

@ -201,7 +201,7 @@ forgit::rebase() {
"
target_commit=$(eval "$cmd" | FZF_DEFAULT_OPTS="$opts" fzf | eval "$forgit_extract_sha")
if [[ -n "$target_commit" ]]; then
prev_commit=$(forgit::previous_commit $target_commit)
prev_commit=$(forgit::previous_commit "$target_commit")
git rebase -i "$prev_commit"
fi
@ -225,7 +225,7 @@ forgit::fixup() {
"
target_commit=$(eval "$cmd" | FZF_DEFAULT_OPTS="$opts" fzf | eval "$forgit_extract_sha")
if [[ -n "$target_commit" ]] && git commit --fixup "$target_commit"; then
prev_commit=$(forgit::previous_commit $target_commit)
prev_commit=$(forgit::previous_commit "$target_commit")
# rebase will fail if there are unstaged changes so --autostash is needed to temporarily stash them
# GIT_SEQUENCE_EDITOR=: is needed to skip the editor
GIT_SEQUENCE_EDITOR=: git rebase --autostash -i --autosquash "$prev_commit"