1
1
if not set -q __GIT_PROMPT_DIR
2
- set __GIT_PROMPT_DIR ~/.bash
2
+ set __GIT_PROMPT_DIR ~/.gitprompt
3
3
end
4
4
5
5
# Colors
@@ -31,6 +31,7 @@ set GIT_PROMPT_CONFLICTS "$Red✖ "
31
31
set GIT_PROMPT_CHANGED " $Blue ✚ "
32
32
set GIT_PROMPT_REMOTE " "
33
33
set GIT_PROMPT_UNTRACKED " …"
34
+ set GIT_PROMPT_STASHED " ⚑ "
34
35
set GIT_PROMPT_CLEAN " $BGreen ✔"
35
36
36
37
function fish_prompt
@@ -60,10 +61,11 @@ function fish_prompt
60
61
set GIT_CONFLICTS $_ _CURRENT_GIT_STATUS[4]
61
62
set GIT_CHANGED $_ _CURRENT_GIT_STATUS[5]
62
63
set GIT_UNTRACKED $_ _CURRENT_GIT_STATUS[6]
63
- set GIT_CLEAN $_ _CURRENT_GIT_STATUS[7]
64
+ set GIT_STASHED $_ _CURRENT_GIT_STATUS[7]
65
+ set GIT_CLEAN $_ _CURRENT_GIT_STATUS[8]
64
66
end
65
67
66
- if test -n " $_ _CURRENT_GIT_STATUS"
68
+ if test -n " $_ _CURRENT_GIT_STATUS"
67
69
set STATUS " $GIT_PROMPT_PREFIX$GIT_PROMPT_BRANCH$GIT_BRANCH$ResetColor "
68
70
69
71
if set -q GIT_REMOTE
@@ -87,6 +89,10 @@ function fish_prompt
87
89
if [ " $GIT_UNTRACKED " != " 0" ]
88
90
set STATUS " $STATUS$GIT_PROMPT_UNTRACKED$GIT_UNTRACKED$ResetColor "
89
91
end
92
+
93
+ if [ " $GIT_STASHED " != " 0" ]
94
+ set STATUS " $STATUS$GIT_PROMPT_STASHED$GIT_STASHED$ResetColor "
95
+ end
90
96
91
97
if [ " $GIT_CLEAN " = " 1" ]
92
98
set STATUS " $STATUS$GIT_PROMPT_CLEAN "
@@ -95,9 +101,9 @@ function fish_prompt
95
101
set STATUS " $STATUS$ResetColor$GIT_PROMPT_SUFFIX "
96
102
97
103
set PS1 " $PROMPT_START$STATUS$PROMPT_END "
98
- else
104
+ else
99
105
set PS1 " $PROMPT_START$PROMPT_END "
100
- end
106
+ end
101
107
102
108
echo -e $PS1
103
109
0 commit comments