mirror of
https://github.com/wfxr/forgit.git
synced 2026-09-10 15:26:16 -04:00
Fix: Pager variables are not evaluated
This commit is contained in:
sandroid
parent
7690364a98
commit
70fac98eea
100
bin/git-forgit
100
bin/git-forgit
|
|
@ -127,12 +127,53 @@ _forgit_quote_files() {
|
|||
echo "${files[*]}"
|
||||
}
|
||||
|
||||
_forgit_pager=${FORGIT_PAGER:-$(git config core.pager || echo 'cat')}
|
||||
_forgit_show_pager=${FORGIT_SHOW_PAGER:-$(git config pager.show || echo "$_forgit_pager")}
|
||||
_forgit_diff_pager=${FORGIT_DIFF_PAGER:-$(git config pager.diff || echo "$_forgit_pager")}
|
||||
_forgit_ignore_pager=${FORGIT_IGNORE_PAGER:-$(hash bat &>/dev/null && echo 'bat -l gitignore --color=always' || echo 'cat')}
|
||||
_forgit_blame_pager=${FORGIT_BLAME_PAGER:-$(git config pager.blame || echo "$_forgit_pager")}
|
||||
_forgit_enter_pager=${FORGIT_ENTER_PAGER:-"LESS='-r' less"}
|
||||
_forgit_page() {
|
||||
local pager
|
||||
pager=${FORGIT_PAGER:-$(git config core.pager)}
|
||||
if [[ -n $pager ]]; then
|
||||
eval "$pager"
|
||||
else
|
||||
cat
|
||||
fi
|
||||
}
|
||||
|
||||
_forgit_diff_page() {
|
||||
local pager
|
||||
pager=${FORGIT_DIFF_PAGER:-$(git config pager.diff)}
|
||||
if [[ -n $pager ]]; then
|
||||
eval "$pager"
|
||||
else
|
||||
_forgit_page
|
||||
fi
|
||||
}
|
||||
|
||||
_forgit_show_page() {
|
||||
local pager
|
||||
pager=${FORGIT_SHOW_PAGER:-$(git config pager.show)}
|
||||
if [[ -n $pager ]]; then
|
||||
eval "$pager"
|
||||
else
|
||||
_forgit_page
|
||||
fi
|
||||
}
|
||||
|
||||
_forgit_blame_page() {
|
||||
local pager
|
||||
pager=${FORGIT_BLAME_PAGER:-$(git config pager.blame)}
|
||||
if [[ -n $pager ]]; then
|
||||
eval "$pager"
|
||||
else
|
||||
_forgit_page
|
||||
fi
|
||||
}
|
||||
|
||||
_forgit_enter_page() {
|
||||
if [[ -n $FORGIT_ENTER_PAGER ]]; then
|
||||
eval "$FORGIT_ENTER_PAGER"
|
||||
else
|
||||
LESS='-r' less
|
||||
fi
|
||||
}
|
||||
|
||||
_forgit_log_graph_enable=${FORGIT_LOG_GRAPH_ENABLE:-"true"}
|
||||
_forgit_log_format=${FORGIT_LOG_FORMAT:-%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset}
|
||||
|
|
@ -148,7 +189,7 @@ _forgit_log_preview() {
|
|||
local sha
|
||||
sha=$(echo "$1" | _forgit_extract_sha)
|
||||
shift
|
||||
echo "$sha" | xargs -I% git show --color=always -U"$_forgit_preview_context" % -- "$@" | $_forgit_show_pager
|
||||
echo "$sha" | xargs -I% git show --color=always -U"$_forgit_preview_context" % -- "$@" | _forgit_show_page
|
||||
}
|
||||
|
||||
_forgit_log_enter() {
|
||||
|
|
@ -223,7 +264,7 @@ _forgit_diff_view() {
|
|||
IFS=" " read -r -a commits <<< "${*:3}"
|
||||
fi
|
||||
echo "$input_line" | _forgit_get_files_from_diff_line | xargs -0 \
|
||||
"$FORGIT" exec_diff "${commits[@]}" -U"$diff_context" -- | $_forgit_diff_pager
|
||||
"$FORGIT" exec_diff "${commits[@]}" -U"$diff_context" -- | _forgit_diff_page
|
||||
}
|
||||
|
||||
_forgit_edit_diffed_file() {
|
||||
|
|
@ -264,7 +305,7 @@ _forgit_diff() {
|
|||
done
|
||||
opts="
|
||||
$FORGIT_FZF_DEFAULT_OPTS
|
||||
+m -0 --bind=\"enter:execute($FORGIT diff_enter {} $escaped_commits | $_forgit_enter_pager)\"
|
||||
+m -0 --bind=\"enter:execute($FORGIT diff_enter {} $escaped_commits | $FORGIT enter_page)\"
|
||||
--preview=\"$FORGIT diff_view {} '$_forgit_preview_context' $escaped_commits\"
|
||||
--bind=\"alt-e:execute-silent($FORGIT edit_diffed_file {})+refresh-preview\"
|
||||
$FORGIT_DIFF_FZF_OPTS
|
||||
|
|
@ -285,9 +326,9 @@ _forgit_diff() {
|
|||
_forgit_add_preview() {
|
||||
file=$(echo "$1" | _forgit_get_single_file_from_add_line)
|
||||
if (git status -s -- "$file" | grep '^??') &>/dev/null; then # diff with /dev/null for untracked files
|
||||
git diff --color=always --no-index -- /dev/null "$file" | $_forgit_diff_pager | sed '2 s/added:/untracked:/'
|
||||
git diff --color=always --no-index -- /dev/null "$file" | _forgit_diff_page | sed '2 s/added:/untracked:/'
|
||||
else
|
||||
git diff --color=always -- "$file" | $_forgit_diff_pager
|
||||
git diff --color=always -- "$file" | _forgit_diff_page
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -339,7 +380,7 @@ _forgit_add() {
|
|||
|
||||
_forgit_reset_head_preview() {
|
||||
file=$1
|
||||
git diff --staged --color=always -- "$file" | $_forgit_diff_pager
|
||||
git diff --staged --color=always -- "$file" | _forgit_diff_page
|
||||
}
|
||||
|
||||
_forgit_git_reset_head() {
|
||||
|
|
@ -377,7 +418,7 @@ _forgit_reset_head() {
|
|||
_forgit_stash_show_preview() {
|
||||
local stash
|
||||
stash=$(echo "$1" | cut -d: -f1)
|
||||
_forgit_git_stash_show "$stash" | $_forgit_diff_pager
|
||||
_forgit_git_stash_show "$stash" | _forgit_diff_page
|
||||
}
|
||||
|
||||
_forgit_git_stash_show() {
|
||||
|
|
@ -393,7 +434,7 @@ _forgit_stash_show() {
|
|||
_forgit_parse_array _forgit_stash_show_git_opts "$FORGIT_STASH_SHOW_GIT_OPTS"
|
||||
opts="
|
||||
$FORGIT_FZF_DEFAULT_OPTS
|
||||
+s +m -0 --tiebreak=index --bind=\"enter:execute($FORGIT stash_show_preview {} | $_forgit_enter_pager)\"
|
||||
+s +m -0 --tiebreak=index --bind=\"enter:execute($FORGIT stash_show_preview {} | $FORGIT enter_page)\"
|
||||
--bind=\"ctrl-y:execute-silent($FORGIT yank_stash_name {})\"
|
||||
--preview=\"$FORGIT stash_show_preview {}\"
|
||||
$FORGIT_STASH_FZF_OPTS
|
||||
|
|
@ -407,9 +448,9 @@ _forgit_stash_show() {
|
|||
|
||||
_forgit_stash_push_preview() {
|
||||
if _forgit_is_file_tracked "$1"; then
|
||||
git diff --color=always -- "$1" | $_forgit_diff_pager
|
||||
git diff --color=always -- "$1" | _forgit_diff_page
|
||||
else
|
||||
git diff --color=always /dev/null "$1" | $_forgit_diff_pager
|
||||
git diff --color=always /dev/null "$1" | _forgit_diff_page
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -468,7 +509,7 @@ _forgit_clean() {
|
|||
}
|
||||
|
||||
_forgit_cherry_pick_preview() {
|
||||
echo "$1" | cut -f2- | _forgit_extract_sha | xargs -I% git show --color=always % | $_forgit_show_pager
|
||||
echo "$1" | cut -f2- | _forgit_extract_sha | xargs -I% git show --color=always % | _forgit_show_page
|
||||
}
|
||||
|
||||
_forgit_cherry_pick() {
|
||||
|
|
@ -585,7 +626,7 @@ _forgit_file_preview() {
|
|||
local sha
|
||||
sha=$(echo "$1" | _forgit_extract_sha)
|
||||
shift
|
||||
echo "$sha" | xargs -I% git show --color=always % -- "$@" | $_forgit_show_pager
|
||||
echo "$sha" | xargs -I% git show --color=always % -- "$@" | _forgit_show_page
|
||||
}
|
||||
|
||||
_forgit_fixup() {
|
||||
|
|
@ -618,7 +659,7 @@ _forgit_fixup() {
|
|||
}
|
||||
|
||||
_forgit_checkout_file_preview() {
|
||||
git diff --color=always -- "$1" | $_forgit_diff_pager
|
||||
git diff --color=always -- "$1" | _forgit_diff_page
|
||||
}
|
||||
|
||||
_forgit_git_checkout_file() {
|
||||
|
|
@ -712,7 +753,7 @@ _forgit_checkout_tag() {
|
|||
}
|
||||
|
||||
_forgit_checkout_commit_preview() {
|
||||
echo "$1" | _forgit_extract_sha | xargs -I% git show --color=always % | $_forgit_show_pager
|
||||
echo "$1" | _forgit_extract_sha | xargs -I% git show --color=always % | _forgit_show_page
|
||||
}
|
||||
|
||||
_forgit_git_checkout_commit() {
|
||||
|
|
@ -779,7 +820,7 @@ _forgit_revert_preview() {
|
|||
cut -f2- |
|
||||
_forgit_extract_sha |
|
||||
xargs -I% git show --color=always % |
|
||||
$_forgit_show_pager
|
||||
_forgit_show_page
|
||||
}
|
||||
|
||||
_forgit_git_revert() {
|
||||
|
|
@ -828,7 +869,7 @@ _forgit_blame_preview() {
|
|||
if _forgit_is_file_tracked "$1"; then
|
||||
_forgit_blame_git_opts=()
|
||||
_forgit_parse_array _forgit_blame_git_opts "$FORGIT_BLAME_GIT_OPTS"
|
||||
git blame "$@" "${_forgit_blame_git_opts[@]}" --date=short | $_forgit_blame_pager
|
||||
git blame "$@" "${_forgit_blame_git_opts[@]}" --date=short | _forgit_blame_page
|
||||
else
|
||||
echo "File not tracked"
|
||||
fi
|
||||
|
|
@ -867,7 +908,19 @@ export FORGIT_GI_REPO_LOCAL="${FORGIT_GI_REPO_LOCAL:-${XDG_CACHE_HOME:-$HOME/.ca
|
|||
export FORGIT_GI_TEMPLATES=${FORGIT_GI_TEMPLATES:-$FORGIT_GI_REPO_LOCAL/templates}
|
||||
|
||||
_forgit_ignore_preview() {
|
||||
$_forgit_ignore_pager "$FORGIT_GI_TEMPLATES/$1"{,.gitignore} 2>/dev/null
|
||||
files=()
|
||||
files=( "$FORGIT_GI_TEMPLATES/$1"{,.gitignore} )
|
||||
if [[ -n $FORGIT_IGNORE_PAGER ]]; then
|
||||
quoted_files=()
|
||||
for file in "${files[@]}"; do
|
||||
quoted_files+=("'$file'")
|
||||
done
|
||||
eval "$FORGIT_IGNORE_PAGER ${quoted_files[*]}" 2> /dev/null
|
||||
elif hash bat &> /dev/null; then
|
||||
bat -l gitignore --color=always "${files[@]}" 2>/dev/null
|
||||
else
|
||||
cat "${files[@]}" 2> /dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
_forgit_ignore() {
|
||||
|
|
@ -961,6 +1014,7 @@ private_commands=(
|
|||
"diff_view"
|
||||
"edit_diffed_file"
|
||||
"edit_add_file"
|
||||
"enter_page"
|
||||
)
|
||||
|
||||
cmd="$1"
|
||||
|
|
|
|||
Loading…
Reference in a new issue