From 06cdf4424619fcc7a9f8e4fbdc67199a785fafd8 Mon Sep 17 00:00:00 2001
From: Ayaz Badouraly <ayaz.badouraly@via.ecp.fr>
Date: Thu, 15 Dec 2016 02:15:24 +0100
Subject: [PATCH] Prioritizing untracked files over stash in prompt
---
README.md | 4 ++--
via.zsh-theme | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index c26ca1d..1451bab 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ Info
|:------:|:--------------------------:|:-----------------------------:|
| red | there are unstaged files | `OHMYVIA_VCS_UNSTAGED_COLOR` |
| yellow | there are staged files | `OHMYVIA_VCS_STAGED_COLOR` |
-| blue | stash stack is not empty | `OHMYVIA_VCS_STASH_COLOR` |
-| cyan | there are untracked files | `OHMYVIA_VCS_UNTRACKED_COLOR` |
+| blue | there are untracked files | `OHMYVIA_VCS_UNTRACKED_COLOR` |
+| cyan | stash stack is not empty | `OHMYVIA_VCS_STASH_COLOR` |
| green | working directory is clean | `OHMYVIA_VCS_CLEAN_COLOR` |
diff --git a/via.zsh-theme b/via.zsh-theme
index 17de91f..9d15161 100644
--- a/via.zsh-theme
+++ b/via.zsh-theme
@@ -32,8 +32,8 @@ zstyle ':vcs_info:*' check-for-changes true # enable %c and %u sequences usage
local vcs_unstaged_color=${OHMYVIA_VCS_UNSTAGED_COLOR:-"%F{red}"}
local vcs_staged_color=${OHMYVIA_VCS_STAGED_COLOR:-"%F{yellow}"}
-local vcs_stash_color=${OHMYVIA_VCS_STASH_COLOR:-"%F{blue}"}
-local vcs_untracked_color=${OHMYVIA_VCS_UNTRACKED_COLOR:-"%F{cyan}"}
+local vcs_untracked_color=${OHMYVIA_VCS_UNTRACKED_COLOR:-"%F{blue}"}
+local vcs_stash_color=${OHMYVIA_VCS_STASH_COLOR:-"%F{cyan}"}
local vcs_clean_color=${OHMYVIA_VCS_CLEAN_COLOR:-"%F{green}"}
zstyle ':vcs_info:*' unstagedstr $vcs_unstaged_color
@@ -58,7 +58,7 @@ function +vi-git-stash() {
fi
}
-zstyle ':vcs_info:git*+set-message:*' hooks git-untracked git-stash
+zstyle ':vcs_info:git*+set-message:*' hooks git-stash git-untracked
# In normal formats and actionformats the following replacements are done:
# %s : The VCS in use (git, hg, svn, etc.).
--
GitLab