From 0e7399ce155227ef672415d6162451932a2eb6bd Mon Sep 17 00:00:00 2001 From: me Date: Mon, 21 Dec 2020 14:51:41 +0300 Subject: [PATCH] Reset color in git format after each line so next line does not get affected --- conf.d/forgit.plugin.fish | 4 ++-- forgit.plugin.zsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.d/forgit.plugin.fish b/conf.d/forgit.plugin.fish index 6e29eec..d7113a2 100644 --- a/conf.d/forgit.plugin.fish +++ b/conf.d/forgit.plugin.fish @@ -52,7 +52,7 @@ function forgit::log -d "git commit viewer" set graph "" end - eval "git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $argv $forgit_emojify" | + eval "git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset' $argv $forgit_emojify" | env FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd" end @@ -230,7 +230,7 @@ function forgit::rebase -d "git rebase " else set graph "" end - set cmd "git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $argv $forgit_emojify" + set cmd "git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset' $argv $forgit_emojify" set files (echo $argv | sed -nE 's/.* -- (.*)/\1/p') set preview "echo {} |grep -Eo '[a-f0-9]+' |head -1 |xargs -I% git show --color=always % -- $files | $forgit_show_pager" diff --git a/forgit.plugin.zsh b/forgit.plugin.zsh index 3980202..974b731 100644 --- a/forgit.plugin.zsh +++ b/forgit.plugin.zsh @@ -27,7 +27,7 @@ forgit::log() { " graph=--graph [[ $FORGIT_LOG_GRAPH_ENABLE == false ]] && graph= - eval "git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $* $forgit_emojify" | + eval "git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset' $* $forgit_emojify" | FZF_DEFAULT_OPTS="$opts" fzf --preview="$cmd" } @@ -168,7 +168,7 @@ forgit::rebase() { local cmd preview opts graph files graph=--graph [[ $FORGIT_LOG_GRAPH_ENABLE == false ]] && graph= - cmd="git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $* $forgit_emojify" + cmd="git log $graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr%Creset' $* $forgit_emojify" files=$(sed -nE 's/.* -- (.*)/\1/p' <<< "$*") # extract files parameters for `git show` command preview="echo {} |grep -Eo '[a-f0-9]+' |head -1 |xargs -I% git show --color=always % -- $files | $forgit_show_pager" opts="