From 9a41bbd51b9f1755b80f9e9e43711dcbbb3c79a3 Mon Sep 17 00:00:00 2001
From: Jacob Olson <jacob.olson@fortemtech.com>
Date: Wed, 6 Mar 2024 13:48:12 -0700
Subject: [PATCH 1/2] added abitily to show stash
---
lib/git.zsh | 18 ++++++++++++++++--
themes/af-magic.zsh-theme | 3 +++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/lib/git.zsh b/lib/git.zsh
index be9fa7e67..e220d83bb 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -35,6 +35,8 @@ function git_prompt_info() {
# Checks if working tree is dirty
function parse_git_dirty() {
local STATUS
+ local STASH_STATUS
+ local STASH_VALID=false
local -a FLAGS
FLAGS=('--porcelain')
if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
@@ -52,11 +54,23 @@ function parse_git_dirty() {
;;
esac
STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
+ STASH_STATUS="$(git stash list | wc -l)"
+ fi
+ if [[ ! -z ${ZSH_THEME_GIT_PROMPT_STASH} && ! -z ${ZSH_THEME_GIT_PROMPT_STASH_DIRTY} && ! -z ${ZSH_THEME_GIT_RESET_COLOR} ]]; then
+ STASH_VALID=true
fi
if [[ -n $STATUS ]]; then
- echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
+ if [[ ! -z ${STASH_STATUS} && ${STASH_STATUS} != 0 && ${STASH_VALID} == true ]]; then
+ echo "${ZSH_THEME_GIT_PROMPT_STASH_DIRTY}${STASH_STATUS}${ZSH_THEME_GIT_RESET_COLOR}"
+ else
+ echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
+ fi
else
- echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
+ if [[ ! -z ${STASH_STATUS} && ${STASH_STATUS} != 0 && ${STASH_VALID} ]]; then
+ echo "$ZSH_THEME_GIT_PROMPT_STASH${STASH_STATUS}${ZSH_THEME_GIT_RESET_COLOR}"
+ else
+ echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
+ fi
fi
}
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 2ef9b02d7..9e8b1b11f 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -33,6 +33,9 @@ RPS1+=" ${FG[237]}%n@%m%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX=" ${FG[075]}(${FG[078]}"
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_STASH="${FG[214]}\$"
+ZSH_THEME_GIT_RESET_COLOR="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_STASH_DIRTY="${FG[214]}*\$"
ZSH_THEME_GIT_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
# hg settings
From c8ee25a1e555668271575acbf3facca31f1cca73 Mon Sep 17 00:00:00 2001
From: Jacob Olson <jacobmoroniolson@gmail.com>
Date: Fri, 21 Feb 2025 15:40:13 -0700
Subject: [PATCH 2/2] updated stash logo
---
themes/af-magic.zsh-theme | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 9e8b1b11f..b4222c633 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -33,9 +33,9 @@ RPS1+=" ${FG[237]}%n@%m%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_PREFIX=" ${FG[075]}(${FG[078]}"
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_GIT_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_STASH="${FG[214]}\$"
+ZSH_THEME_GIT_PROMPT_STASH="${FG[214]}↓"
ZSH_THEME_GIT_RESET_COLOR="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_STASH_DIRTY="${FG[214]}*\$"
+ZSH_THEME_GIT_PROMPT_STASH_DIRTY="${FG[214]}*↓"
ZSH_THEME_GIT_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
# hg settings