From 631031463c8e35d966b633232f56367937b2e634 Mon Sep 17 00:00:00 2001 From: eKa Date: Thu, 17 Oct 2019 14:45:22 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20git-prompt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zsh/plugins/git-prompt/git-prompt.plugin.zsh | 3 ++- zsh/themes/eof.zsh-theme | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zsh/plugins/git-prompt/git-prompt.plugin.zsh b/zsh/plugins/git-prompt/git-prompt.plugin.zsh index 7b9d70f..ee00df5 100644 --- a/zsh/plugins/git-prompt/git-prompt.plugin.zsh +++ b/zsh/plugins/git-prompt/git-prompt.plugin.zsh @@ -49,6 +49,7 @@ git_super_status() { precmd_update_git_vars if [ -n "$__CURRENT_GIT_STATUS" ]; then STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}" + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR" if [ "$GIT_BEHIND" -ne "0" ]; then STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}" fi @@ -57,7 +58,7 @@ git_super_status() { fi STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR" if [ "$GIT_STAGED" -ne "0" ]; then - STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SEPARATOR" + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}" fi if [ "$GIT_CONFLICTS" -ne "0" ]; then STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}" diff --git a/zsh/themes/eof.zsh-theme b/zsh/themes/eof.zsh-theme index 23d1a1f..e503e7c 100644 --- a/zsh/themes/eof.zsh-theme +++ b/zsh/themes/eof.zsh-theme @@ -11,8 +11,8 @@ ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[green]%}" ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[white]%}%{⚒%G%}" ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}" ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[yellow]%}%{☀%G%}" -ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}" -ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}" +ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[white]%}%{↓%G%}" +ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[white]%}%{↑%G%}" ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[blue]%}%{?%G%}" ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}%{✔%G%}" ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}♻"