From 4d32370ba23c93112eca1010e262fb7a0346220f Mon Sep 17 00:00:00 2001 From: Julian Prein Date: Wed, 30 Oct 2024 10:47:13 +0100 Subject: [PATCH] glog: Use git's core.pager This way diff-so-fancy can easily be replaced/customized. --- .config/zsh/autoload/git/glog | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.config/zsh/autoload/git/glog b/.config/zsh/autoload/git/glog index 3be9c33..9871ba9 100755 --- a/.config/zsh/autoload/git/glog +++ b/.config/zsh/autoload/git/glog @@ -67,13 +67,12 @@ fzf_preview[patch]="$fzf_preview[construct] { $REPLY" # for preview) fzf_preview[files_only]="$fzf_preview[patch] ${(@)${@:${@[(ei)--]}}/(#m)*/\"$MATCH\"}" -if (( $+commands[diff-so-fancy] )); then - fzf_preview[patch]+=" | diff-so-fancy --color=always" - fzf_preview[files_only]+=" | diff-so-fancy --color=always" -fi - -fzf_preview[patch]+="; }" -fzf_preview[files_only]+="; }" +# Use git's pager in the preview window (and with it any special highlighting +# tool, such as diff-so-fancy) +local pager +pager="$(git config --get --default="" core.pager)" +fzf_preview[patch]+="${pager:+ | }$pager; }" +fzf_preview[files_only]+="${pager:+ | }$pager; }" read -r -d '' <