Skip to content

Commit d1e542b

Browse files
committed
Stashed support for fish
1 parent 712f17b commit d1e542b

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

gitprompt.fish

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if not set -q __GIT_PROMPT_DIR
2-
set __GIT_PROMPT_DIR ~/.bash
2+
set __GIT_PROMPT_DIR ~/.gitprompt
33
end
44

55
# Colors
@@ -31,6 +31,7 @@ set GIT_PROMPT_CONFLICTS "$Red✖ "
3131
set GIT_PROMPT_CHANGED "$Blue"
3232
set GIT_PROMPT_REMOTE " "
3333
set GIT_PROMPT_UNTRACKED ""
34+
set GIT_PROMPT_STASHED ""
3435
set GIT_PROMPT_CLEAN "$BGreen"
3536

3637
function fish_prompt
@@ -60,10 +61,11 @@ function fish_prompt
6061
set GIT_CONFLICTS $__CURRENT_GIT_STATUS[4]
6162
set GIT_CHANGED $__CURRENT_GIT_STATUS[5]
6263
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]
6466
end
6567

66-
if test -n "$__CURRENT_GIT_STATUS"
68+
if test -n "$__CURRENT_GIT_STATUS"
6769
set STATUS " $GIT_PROMPT_PREFIX$GIT_PROMPT_BRANCH$GIT_BRANCH$ResetColor"
6870

6971
if set -q GIT_REMOTE
@@ -87,6 +89,10 @@ function fish_prompt
8789
if [ "$GIT_UNTRACKED" != "0" ]
8890
set STATUS "$STATUS$GIT_PROMPT_UNTRACKED$GIT_UNTRACKED$ResetColor"
8991
end
92+
93+
if [ "$GIT_STASHED" != "0" ]
94+
set STATUS "$STATUS$GIT_PROMPT_STASHED$GIT_STASHED$ResetColor"
95+
end
9096

9197
if [ "$GIT_CLEAN" = "1" ]
9298
set STATUS "$STATUS$GIT_PROMPT_CLEAN"
@@ -95,9 +101,9 @@ function fish_prompt
95101
set STATUS "$STATUS$ResetColor$GIT_PROMPT_SUFFIX"
96102

97103
set PS1 "$PROMPT_START$STATUS$PROMPT_END"
98-
else
104+
else
99105
set PS1 "$PROMPT_START$PROMPT_END"
100-
end
106+
end
101107

102108
echo -e $PS1
103109

0 commit comments

Comments
 (0)