Skip to content

Feat: Use forgit show in stash_show enter #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlfriedrich merged 2 commits into from
Jul 15, 2025
Merged

Feat: Use forgit show in stash_show enter #450

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d44689
Feat: Use forgit show in stash_show enter (#450)
carlfriedrich Jul 15, 2025
8a0dd10
Refactor: Remove unnecessary xargs in git show commands
carlfriedrich Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions bin/git-forgit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@ _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_pager show
git show --color=always -U"$_forgit_preview_context" "${sha}" -- "$@" | _forgit_pager show
}

_forgit_log_enter() {
local sha
sha=$(echo "$1" | _forgit_extract_sha)
shift
echo "$sha" | xargs -I% "${FORGIT}" show % "$@"
"${FORGIT}" show "${sha}" "$@"
}

# git commit viewer
Expand Down Expand Up @@ -525,24 +525,26 @@ _forgit_reset_head() {

_forgit_stash_show_preview() {
local stash
stash=$(echo "$1" | cut -d: -f1)
_forgit_git_stash_show "$stash" | _forgit_pager diff
stash=$(echo "$1" | _forgit_extract_stash_name)
git show --color=always -U"$_forgit_preview_context" "${stash}" | _forgit_pager show
}

_forgit_git_stash_show() {
git stash show --color=always --ext-diff "$@"
_forgit_stash_show_enter() {
local stash
stash=$(echo "$1" | _forgit_extract_stash_name)
"${FORGIT}" show "${stash}"
}

# git stash viewer
_forgit_stash_show() {
_forgit_inside_work_tree || return 1
local opts
[[ $# -ne 0 ]] && { _forgit_git_stash_show "$@"; return $?; }
[[ $# -ne 0 ]] && { "${FORGIT}" show "$@"; return $?; }
_forgit_stash_show_git_opts=()
_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 pager enter)\"
+s +m -0 --tiebreak=index --bind=\"enter:execute($FORGIT stash_show_enter {})\"
--bind=\"ctrl-y:execute-silent($FORGIT yank_stash_name {})\"
--preview=\"$FORGIT stash_show_preview {}\"
$FORGIT_STASH_FZF_OPTS
Expand Down Expand Up @@ -633,7 +635,9 @@ _forgit_clean() {
}

_forgit_cherry_pick_preview() {
echo "$1" | cut -f2- | _forgit_extract_sha | xargs -I% git show --color=always % | _forgit_pager show
local sha
sha=$(echo "$1" | cut -f2- | _forgit_extract_sha)
git show --color=always "${sha}" | _forgit_pager show
}

_forgit_cherry_pick() {
Expand Down Expand Up @@ -749,7 +753,7 @@ _forgit_file_preview() {
local sha
sha=$(echo "$1" | _forgit_extract_sha)
shift
echo "$sha" | xargs -I% git show --color=always % -- "$@" | _forgit_pager show
git show --color=always "${sha}" -- "$@" | _forgit_pager show
}

_forgit_fixup() {
Expand Down Expand Up @@ -922,7 +926,9 @@ _forgit_checkout_tag() {
}

_forgit_checkout_commit_preview() {
echo "$1" | _forgit_extract_sha | xargs -I% git show --color=always % | _forgit_pager show
local sha
sha=$(echo "$1" | _forgit_extract_sha)
git show --color=always "${sha}" | _forgit_pager show
}

_forgit_git_checkout_commit() {
Expand Down Expand Up @@ -985,11 +991,9 @@ _forgit_branch_delete() {
}

_forgit_revert_preview() {
echo "$1" |
cut -f2- |
_forgit_extract_sha |
xargs -I% git show --color=always % |
_forgit_pager show
local sha
sha=$(echo "$1" | cut -f2- | _forgit_extract_sha)
git show --color=always "${sha}" | _forgit_pager show
}

_forgit_git_revert() {
Expand Down Expand Up @@ -1106,7 +1110,7 @@ _forgit_ignore() {
args=()
while IFS='' read -r arg; do
args+=("$arg")
done < <(_forgit_paths_list "$FORGIT_GI_TEMPLATES" .gitignore |
done < <(_forgit_paths_list "$FORGIT_GI_TEMPLATES" .gitignore |
nl -w4 -s' ' |
FZF_DEFAULT_OPTS="$opts" fzf | awk '{print $2}')
fi
Expand Down Expand Up @@ -1221,6 +1225,7 @@ private_commands=(
"show_enter"
"show_preview"
"stash_push_preview"
"stash_show_enter"
"stash_show_preview"
"yank_sha"
"yank_stash_name"
Expand Down
Loading