Skip to content

Commit

Permalink
Rename escaped_files into quoted_files
Browse files Browse the repository at this point in the history
  • Loading branch information
sandr01d committed Jan 1, 2024
1 parent 18acef7 commit e026a6d
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions bin/git-forgit
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ _forgit_parse_array() {

# parse the input arguments and print only those after the "--"
# separator as a single line of qouted arguments to stdout
_forgit_escaped_files() {
_forgit_quote_files() {
local files add
files=()
add=false
Expand Down Expand Up @@ -201,14 +201,14 @@ _forgit_log_enter() {
# git commit viewer
_forgit_log() {
_forgit_inside_work_tree || return 1
local opts graph escaped_files log_format
escaped_files=$(_forgit_escaped_files "$@")
local opts graph quoted_files log_format
quoted_files=$(_forgit_quote_files "$@")
opts="
$FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index
--bind=\"enter:execute($FORGIT log_enter \"{}\" $escaped_files)\"
--bind=\"enter:execute($FORGIT log_enter \"{}\" $quoted_files)\"
--bind=\"ctrl-y:execute-silent($FORGIT yank_sha {})\"
--preview=\"$FORGIT log_preview \"{}\" $escaped_files\"
--preview=\"$FORGIT log_preview \"{}\" $quoted_files\"
$FORGIT_LOG_FZF_OPTS
"
graph=()
Expand Down Expand Up @@ -556,15 +556,15 @@ _forgit_cherry_pick_from_branch() {

_forgit_rebase() {
_forgit_inside_work_tree || return 1
local opts graph escaped_files target_commit prev_commit
local opts graph quoted_files target_commit prev_commit
graph=()
[[ $_forgit_log_graph_enable == true ]] && graph=(--graph)
escaped_files=$(_forgit_escaped_files "$@")
quoted_files=$(_forgit_quote_files "$@")
opts="
$FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index
--bind=\"ctrl-y:execute-silent($FORGIT yank_sha {})\"
--preview=\"$FORGIT file_preview {} $escaped_files\"
--preview=\"$FORGIT file_preview {} $quoted_files\"
$FORGIT_REBASE_FZF_OPTS
"
target_commit=$(
Expand All @@ -587,15 +587,15 @@ _forgit_file_preview() {
_forgit_fixup() {
_forgit_inside_work_tree || return 1
git diff --cached --quiet && echo 'Nothing to fixup: there are no staged changes.' && return 1
local opts graph escaped_files target_commit prev_commit
local opts graph quoted_files target_commit prev_commit
graph=()
[[ $_forgit_log_graph_enable == true ]] && graph=(--graph)
escaped_files=$(_forgit_escaped_files "$@")
quoted_files=$(_forgit_quote_files "$@")
opts="
$FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index
--bind=\"ctrl-y:execute-silent($FORGIT yank_sha {})\"
--preview=\"$FORGIT file_preview {} $escaped_files\"
--preview=\"$FORGIT file_preview {} $quoted_files\"
$FORGIT_FIXUP_FZF_OPTS
"
target_commit=$(
Expand Down

0 comments on commit e026a6d

Please sign in to comment.