From 58882fd6ba0098804faf992d40ab1d70b75f45d8 Mon Sep 17 00:00:00 2001 From: carlfriedrich Date: Fri, 14 Oct 2022 14:19:38 +0200 Subject: [PATCH] fish plugin: move function order to match zsh version Also add checkout::tag and blame, which were missing. --- conf.d/forgit.plugin.fish | 52 ++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/conf.d/forgit.plugin.fish b/conf.d/forgit.plugin.fish index 4f082ba..f3dd8ab 100644 --- a/conf.d/forgit.plugin.fish +++ b/conf.d/forgit.plugin.fish @@ -18,22 +18,6 @@ function forgit::reset::head -d "git reset HEAD (unstage) selector" "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" reset_head "$argv" end -function forgit::checkout::file -d "git checkout-file selector" --argument-names 'file_name' --wraps "git checkout --" - "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" checkout_file "$argv" -end - -function forgit::checkout::commit -d "git checkout commit selector" --argument-names 'commit_id' --wraps "git checkout" - "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" checkout_commit "$argv" -end - -function forgit::branch::delete -d "git checkout branch deleter" --wraps "git branch --delete" - "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" branch_delete "$argv" -end - -function forgit::checkout::branch -d "git checkout branch selector" --argument-names 'input_branch_name' --wraps "git branch" - "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" checkout_branch "$argv" -end - function forgit::stash::show -d "git stash viewer" "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" stash_show "$argv" end @@ -50,22 +34,46 @@ function forgit::cherry::pick::from::branch -d "git cherry-picking with interact "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" cherry_pick_from_branch "$argv" end -function forgit::fixup -d "git fixup" - "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" fixup "$argv" -end - function forgit::rebase -d "git rebase" "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" rebase "$argv" end -function forgit::ignore -d "git ignore generator" - "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" ignore "$argv" +function forgit::fixup -d "git fixup" + "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" fixup "$argv" +end + +function forgit::checkout::file -d "git checkout-file selector" --argument-names 'file_name' --wraps "git checkout --" + "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" checkout_file "$argv" +end + +function forgit::checkout::branch -d "git checkout branch selector" --argument-names 'input_branch_name' --wraps "git branch" + "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" checkout_branch "$argv" +end + +function forgit::checkout::tag -d "git checkout tag selector" --argument-names 'tag_name' --wraps "git checkout" + "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" checkout_tag "$argv" +end + +function forgit::checkout::commit -d "git checkout commit selector" --argument-names 'commit_id' --wraps "git checkout" + "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" checkout_commit "$argv" +end + +function forgit::branch::delete -d "git checkout branch deleter" --wraps "git branch --delete" + "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" branch_delete "$argv" end function forgit::revert::commit --argument-names 'commit_hash' --wraps "git revert --" "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" revert_commit "$argv" end +function forgit::blame + "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" blame "$argv" +end + +function forgit::ignore -d "git ignore generator" + "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" ignore "$argv" +end + function forgit::ignore::update "$FORGIT_INSTALL_DIR/conf.d/bin/git-forgit" ignore_update "$argv" end