From b61df0c2061d9db47cb6bce34a46fea460bb2605 Mon Sep 17 00:00:00 2001 From: Christopher Apple Date: Mon, 21 Mar 2022 09:49:00 -0700 Subject: [PATCH] Added support for FORGIT_GLO_FORMAT --- conf.d/forgit.plugin.fish | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/conf.d/forgit.plugin.fish b/conf.d/forgit.plugin.fish index 4340745..dbf13a5 100644 --- a/conf.d/forgit.plugin.fish +++ b/conf.d/forgit.plugin.fish @@ -51,13 +51,19 @@ function forgit::log -d "git commit viewer" $FORGIT_LOG_FZF_OPTS " + if test -n "$FORGIT_GLO_FORMAT" + set log_format "$FORGIT_GLO_FORMAT" + else + set log_format "$forgit_log_format" + end + if set -q FORGIT_LOG_GRAPH_ENABLE set graph "--graph" else set graph "" end - eval "git log $graph --color=always --format='$forgit_log_format' $argv $forgit_emojify" | + eval "git log $graph --color=always --format='$log_format' $argv $forgit_emojify" | env FZF_DEFAULT_OPTS="$opts" fzf end @@ -80,6 +86,7 @@ function forgit::diff -d "git diff viewer" --argument-names arg1 arg2 set repo (git rev-parse --show-toplevel) set preview "echo {} | sed 's/.*] *//' | sed 's/ -> / /' | xargs -I% git diff --color=always $commits -- '$repo/%' | $forgit_diff_pager" + set opts " $FORGIT_FZF_DEFAULT_OPTS +m -0 --bind=\"enter:execute($preview |env LESS='-r' less)\"