-
-
Save junegunn/f4fca918e937e6bf5bad to your computer and use it in GitHub Desktop.
| # fshow - git commit browser (enter for show, ctrl-d for diff, ` toggles sort) | |
| fshow() { | |
| local out shas sha q k | |
| while out=$( | |
| git log --graph --color=always \ | |
| --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$@" | | |
| fzf --ansi --multi --no-sort --reverse --query="$q" \ | |
| --print-query --expect=ctrl-d --toggle-sort=\`); do | |
| q=$(head -1 <<< "$out") | |
| k=$(head -2 <<< "$out" | tail -1) | |
| shas=$(sed '1,2d;s/^[^a-z0-9]*//;/^$/d' <<< "$out" | awk '{print $1}') | |
| [ -z "$shas" ] && continue | |
| if [ "$k" = ctrl-d ]; then | |
| git diff --color=always $shas | less -R | |
| else | |
| for sha in $shas; do | |
| git show --color=always $sha | less -R | |
| done | |
| fi | |
| done | |
| } |
@avshyz Wow, that's really neat. I like how you can search through the diffs of commits to find relevant code. Thank you for sharing
@avshyz fzf provides a way to dynamically or manually reload the list which I believe is more flexible than the way skim approaches the problem.
https://github.com/junegunn/fzf#reloading-the-candidate-list
@maheshsundaram always glad to share :)
@junegunn Ohhhh that's super interesting and useful! I'll definitely find use to that in future scripts! It's just that when I wrote that shell function (a year or two ago) fzf didn't have that option, and I never bothered rewriting it to use fzf instead of skim (though it may be worthwhile to do so)
Many thanks to everyone for sharing. After struggling with gitconfig's escaping for a while, I managed to put @rndware's script into .gitconfig with a few tweaks to use ripgrep, git-delta and clipboard-cli:
[core]
pager = delta --line-numbers
[alias]
fzf = !" \
function gfzf() { \
local filter; \
if [ -n $@ ] && [ -e $@ ]; then \
filter=\"-- $@\"; \
fi; \
export LESS='-R' \
export BAT_PAGER='less -S -R -M -i'; \
git log \
--graph --color=always --abbrev=7 \
--format=format:\"%C(bold blue)%h%C(reset) %C(dim white)%an%C(reset)%C(bold yellow)%d%C(reset) %C(white)%s%C(reset) %C(bold green)(%ar)%C(reset)\" $@ | \
fzf --ansi --no-sort --layout=reverse --tiebreak=index \
--preview=\"f() { set -- \\$(echo -- \\$@ | rg -o '\\b[a-f0-9]{7,}\\b'); [ \\$# -eq 0 ] || git show --color=always \\$1 $filter | delta --line-numbers; }; f {}\" \
--bind=\"ctrl-d:half-page-down,ctrl-u:half-page-up,ctrl-j:preview-down,ctrl-k:preview-up,ctrl-f:preview-page-down,ctrl-b:preview-page-up\" \
--bind=\"ctrl-m:execute: \
(rg -o '\\b[a-f0-9]{7,}\\b' | head -1 | \
xargs -I % -- git show --color=always %) << 'FZFEOF'\n \
{} \
\nFZFEOF\" \
--bind=\"ctrl-y:execute-silent: \
(rg -o '\\b[a-f0-9]{7,}\\b' | head -1 | tr -d \\$'\\n' | clipboard) << 'FZFEOF'\n \
{} \
\nFZFEOF\" \
--preview-window=right:60%; \
}; \
gfzf \
"
[interactive]
diffFilter = delta --color-only --line-numbers
@Frederick888 this is awesome, thanks!
Dependency for this to work:
https://github.com/dandavison/delta#installation
https://github.com/sindresorhus/clipboard-cli
@ultrox Glad to know that you found it useful. I've actually updated the subcommand for a few times since then: https://git.tsundere.moe/Frederick888/frederick-settings/blob/master/.gitconfig
git-fzf.small.mp4
@Frederick888 I'll check it out later. My use-case is actually different , I'm looking to use fzf to find commit to fixup :).
git fixup <command>
I would then go to fzf and look for commit based on the title, enter would return hash.
@Frederick888 thanks for sharing this, so useful—just bumped my git efficiency up a few notches!
Thanks everybody for sharing your versions. All of this was so helpful!
After spending some hours of optimizing, I'd like to throw my version on the table as well. It adds the diff stats in the preview window, using a dimmed presentation:
When entering a commit, another fzf instance opens up containing a list of files changed in that commit, with the preview window showing the diff for that file:
Entering a file shows the diff on that file with its complete context.
The git-fuzzy-diff function detects whether diff-so-fancy is installed and, if so, uses it.
Furthermore I tried to split and structure the code a bit in order to not have just one huge intransparent command. I started off from @victorbrca's version and now it looks like this:
GIT_FZF_DEFAULT_OPTS="
$FZF_DEFAULT_OPTS
--ansi
--reverse
--height=100%
--bind shift-down:preview-down
--bind shift-up:preview-up
--bind pgdn:preview-page-down
--bind pgup:preview-page-up
--bind q:abort
$GIT_FZF_DEFAULT_OPTS
"
git-fuzzy-diff ()
{
PREVIEW_PAGER="less --tabs=4 -Rc"
ENTER_PAGER=${PREVIEW_PAGER}
if [ -x "$(command -v diff-so-fancy)" ]; then
PREVIEW_PAGER="diff-so-fancy | ${PREVIEW_PAGER}"
ENTER_PAGER="diff-so-fancy | sed -e '1,4d' | ${ENTER_PAGER}"
fi
# Don't just diff the selected file alone, get related files first using
# '--name-status -R' in order to include moves and renames in the diff.
# See for reference: https://stackoverflow.com/q/71268388/3018229
PREVIEW_COMMAND='git diff --color=always '$@' -- \
$(echo $(git diff --name-status -R '$@' | grep {}) | cut -d" " -f 2-) \
| '$PREVIEW_PAGER
# Show additional context compared to preview
ENTER_COMMAND='git diff --color=always '$@' -U10000 -- \
$(echo $(git diff --name-status -R '$@' | grep {}) | cut -d" " -f 2-) \
| '$ENTER_PAGER
git diff --name-only $@ | \
fzf ${GIT_FZF_DEFAULT_OPTS} --exit-0 --preview "${PREVIEW_COMMAND}" \
--preview-window=top:85% --bind "enter:execute:${ENTER_COMMAND}"
}
git-fuzzy-log ()
{
PREVIEW_COMMAND='f() {
set -- $(echo -- "$@" | grep -o "[a-f0-9]\{7\}")
[ $# -eq 0 ] || (
git show --no-patch --color=always $1
echo
git show --stat --format="" --color=always $1 |
while read line; do
tput dim
echo " $line" | sed "s/\x1B\[m/\x1B\[2m/g"
tput sgr0
done |
tac | sed "1 a \ " | tac
)
}; f {}'
ENTER_COMMAND='(grep -o "[a-f0-9]\{7\}" | head -1 |
xargs -I % bash -ic "git-fuzzy-diff %^1 %") <<- "FZF-EOF"
{}
FZF-EOF'
git log --graph --color=always --format="%C(auto)%h %s%d " | \
fzf ${GIT_FZF_DEFAULT_OPTS} --no-sort --tiebreak=index \
--preview "${PREVIEW_COMMAND}" --preview-window=top:15 \
--bind "enter:execute:${ENTER_COMMAND}"
}In my gitconfig I have set up aliases for it:
[alias]
fd = !bash -ic 'git-fuzzy-diff \"$@\"' x
fl = !bash -ic 'git-fuzzy-log \"$@\"' x
Perhaps someone should turn this into a zsh plugin?
@melkster Actually there is a project called forgit, which does something similar based on fzf and is available as a zsh plugin.
@carlfriedrich Interesting, I'll check it out!
@melkster FYI I edited my post above with an updated version, adding a git-fuzzy-diff command which shows a diff for each changed file separately.
I think one could plug this into forgit, if it would allow for customizing the preview command, which is not possible at the moment. I created an issue for that. If you are interested in that as well, maybe you could add a comment there to show that I'm not the only person who might want this. :-)
@Frederick888 I'll check it out later. My use-case is actually different , I'm looking to use fzf to find commit to fixup :).
git fixup <command>I would then go to fzf and look for commit based on the title, enter would return hash.
How did you hook it up at the end? a fuzzy-find for fixup sounds awesome!
@ultrox @slerer
This article gives you a git alias that is exactly what you are after
@Melkster - I've managed to accomplish that using sk (skim), which is an alternative to fzf.
I've also used ripgrep to highlight the matches, so you may need to install them both to make the following code work:
It took me way to long to perfect this alias (starting after asking here on this gist, a year or so ago), but it has served me well ever since