Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
78e3f38d
Commit
78e3f38d
authored
Dec 04, 2012
by
Robby Russell
Browse files
Merge pull request #1258 from caio/git-branch-status
Add branch status support to git_prompt_status
parents
d100354d
a3c2a2f6
Changes
1
Show whitespace changes
Inline
Side-by-side
lib/git.zsh
View file @
78e3f38d
...
@@ -58,7 +58,7 @@ function git_prompt_long_sha() {
...
@@ -58,7 +58,7 @@ function git_prompt_long_sha() {
# Get the status of the working tree
# Get the status of the working tree
git_prompt_status
()
{
git_prompt_status
()
{
INDEX
=
$(
git status
--porcelain
2> /dev/null
)
INDEX
=
$(
git status
--porcelain
-b
2> /dev/null
)
STATUS
=
""
STATUS
=
""
if
$(
echo
"
$INDEX
"
|
grep
'^?? '
&> /dev/null
)
;
then
if
$(
echo
"
$INDEX
"
|
grep
'^?? '
&> /dev/null
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS
"
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS
"
...
@@ -88,6 +88,15 @@ git_prompt_status() {
...
@@ -88,6 +88,15 @@ git_prompt_status() {
if
$(
echo
"
$INDEX
"
|
grep
'^UU '
&> /dev/null
)
;
then
if
$(
echo
"
$INDEX
"
|
grep
'^UU '
&> /dev/null
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS
"
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS
"
fi
fi
if
$(
echo
"
$INDEX
"
|
grep
'^## .*ahead'
&> /dev/null
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS
"
fi
if
$(
echo
"
$INDEX
"
|
grep
'^## .*behind'
&> /dev/null
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS
"
fi
if
$(
echo
"
$INDEX
"
|
grep
'^## .*diverged'
&> /dev/null
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS
"
fi
echo
$STATUS
echo
$STATUS
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment