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
Oh My Zsh
Commits
17eba9e4
Commit
17eba9e4
authored
Apr 29, 2011
by
Robby Russell
Browse files
Merged pull request #308 from juanghurtado/master.
New prompt methods on Git lib file
parents
a89d33c0
077baa7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/git.zsh
View file @
17eba9e4
...
@@ -4,7 +4,8 @@ function git_prompt_info() {
...
@@ -4,7 +4,8 @@ function git_prompt_info() {
echo
"
$ZSH_THEME_GIT_PROMPT_PREFIX
${
ref
#refs/heads/
}
$(
parse_git_dirty
)
$ZSH_THEME_GIT_PROMPT_SUFFIX
"
echo
"
$ZSH_THEME_GIT_PROMPT_PREFIX
${
ref
#refs/heads/
}
$(
parse_git_dirty
)
$ZSH_THEME_GIT_PROMPT_SUFFIX
"
}
}
parse_git_dirty
()
{
# Checks if working tree is dirty
parse_git_dirty
()
{
if
[[
-n
$(
git status
-s
2> /dev/null
)
]]
;
then
if
[[
-n
$(
git status
-s
2> /dev/null
)
]]
;
then
echo
"
$ZSH_THEME_GIT_PROMPT_DIRTY
"
echo
"
$ZSH_THEME_GIT_PROMPT_DIRTY
"
else
else
...
@@ -12,7 +13,24 @@ parse_git_dirty () {
...
@@ -12,7 +13,24 @@ parse_git_dirty () {
fi
fi
}
}
# get the status of the working tree
# Checks if there are commits ahead from remote
function
git_prompt_ahead
()
{
if
$(
echo
"
$(
git log origin/master..HEAD 2> /dev/null
)
"
|
grep
'^commit'
&> /dev/null
)
;
then
echo
"
$ZSH_THEME_GIT_PROMPT_AHEAD
"
fi
}
# Formats prompt string for current git commit short SHA
function
git_prompt_short_sha
()
{
SHA
=
$(
git rev-parse
--short
HEAD 2> /dev/null
)
&&
echo
"
$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER
"
}
# Formats prompt string for current git commit long SHA
function
git_prompt_long_sha
()
{
SHA
=
$(
git rev-parse HEAD 2> /dev/null
)
&&
echo
"
$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER
"
}
# Get the status of the working tree
git_prompt_status
()
{
git_prompt_status
()
{
INDEX
=
$(
git status
--porcelain
2> /dev/null
)
INDEX
=
$(
git status
--porcelain
2> /dev/null
)
STATUS
=
""
STATUS
=
""
...
@@ -41,4 +59,4 @@ git_prompt_status() {
...
@@ -41,4 +59,4 @@ git_prompt_status() {
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS
"
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS
"
fi
fi
echo
$STATUS
echo
$STATUS
}
}
\ No newline at end of file
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