From 9a36f6ea5e2378acf502688fd5d8f3475be2c43e Mon Sep 17 00:00:00 2001 From: Wenxuan Zhang Date: Thu, 27 Aug 2020 11:25:32 +0800 Subject: [PATCH] refactor: reformat --- forgit.plugin.zsh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh index 01a5dd2..f2fcb1c 100755 --- a/forgit.plugin.zsh +++ b/forgit.plugin.zsh @@ -147,6 +147,21 @@ forgit::clean() { echo 'Nothing to clean.' } +forgit::cherry::pick() { + local base target preview opts + base=$(git branch --show-current) + [[ -z $1 ]] && echo "Please specify target branch" && return 1 + target="$1" + preview="echo {1} | xargs -I% git show --color=always % | $forgit_show_pager" + opts=" + $FORGIT_FZF_DEFAULT_OPTS + -m -0 + " + git cherry "$base" "$target" --abbrev -v | cut -d ' ' -f2- | + FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" | cut -d' ' -f1 | + xargs -I% git cherry-pick % +} + # git ignore generator export FORGIT_GI_REPO_REMOTE=${FORGIT_GI_REPO_REMOTE:-https://github.com/dvcs/gitignore} export FORGIT_GI_REPO_LOCAL=${FORGIT_GI_REPO_LOCAL:-~/.forgit/gi/repos/dvcs/gitignore} @@ -201,21 +216,6 @@ forgit::ignore::clean() { [[ -d "$FORGIT_GI_REPO_LOCAL" ]] && rm -rf "$FORGIT_GI_REPO_LOCAL" } -forgit::cherry::pick() { - local base target preview opts - base=$(git branch --show-current) - [[ -z $1 ]] && echo "Please specify target branch" && return 1 - target="$1" - preview="echo {1} | xargs -I% git show --color=always % | $forgit_show_pager" - opts=" - $FORGIT_FZF_DEFAULT_OPTS - -m -0 - " - git cherry "$base" "$target" --abbrev -v | cut -d ' ' -f2- | - FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" | cut -d' ' -f1 | - xargs -I% git cherry-pick % -} - FORGIT_FZF_DEFAULT_OPTS=" $FZF_DEFAULT_OPTS --ansi