From 9daf9d6542912352fc899c40d9a99db8b9bda04f Mon Sep 17 00:00:00 2001 From: sandroid Date: Sun, 5 Nov 2023 00:48:39 +0100 Subject: [PATCH] Remove deferred execution in _forgit_rebase --- bin/git-forgit | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/git-forgit b/bin/git-forgit index bb195fc..4469004 100755 --- a/bin/git-forgit +++ b/bin/git-forgit @@ -537,24 +537,24 @@ _forgit_cherry_pick_from_branch() { _forgit_rebase() { _forgit_inside_work_tree || return 1 - local opts graph files target_commit prev_commit + local opts graph quoted_files target_commit prev_commit graph=() [[ $_forgit_log_graph_enable == true ]] && graph=(--graph) _forgit_rebase_git_opts=() _forgit_parse_array _forgit_rebase_git_opts "$FORGIT_REBASE_GIT_OPTS" - files=$(sed -nE 's/.* -- (.*)/\1/p' <<< "$*") # extract files parameters for `git show` command + quoted_files=$(_forgit_quote_files "$@") opts=" $FORGIT_FZF_DEFAULT_OPTS +s +m --tiebreak=index - --bind=\"ctrl-y:execute-silent(echo {} | $_forgit_extract_sha | ${FORGIT_COPY_CMD:-pbcopy})\" - --preview=\"$FORGIT file_preview {} $files\" + --bind=\"ctrl-y:execute-silent($FORGIT yank_sha {})\" + --preview=\"$FORGIT file_preview {} $quoted_files\" $FORGIT_REBASE_FZF_OPTS " target_commit=$( git log "${graph[@]}" --color=always --format="$_forgit_log_format" "$@" | _forgit_emojify | FZF_DEFAULT_OPTS="$opts" fzf | - eval "$_forgit_extract_sha") + _forgit_extract_sha) if [[ -n "$target_commit" ]]; then prev_commit=$(_forgit_previous_commit "$target_commit") git rebase -i "${_forgit_rebase_git_opts[@]}" "$prev_commit"