Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
01da53e1
Commit
01da53e1
authored
Jul 15, 2014
by
Robby Russell
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2828 from r3dDoX/master
removed a hardcoded 'origin' in git.zsh and added new function for number of commits ahead of remote
parents
9f8c5d00
51469312
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
git.zsh
lib/git.zsh
+9
-1
No files found.
lib/git.zsh
View file @
01da53e1
...
@@ -54,11 +54,19 @@ git_remote_status() {
...
@@ -54,11 +54,19 @@ git_remote_status() {
# Checks if there are commits ahead from remote
# Checks if there are commits ahead from remote
function
git_prompt_ahead
()
{
function
git_prompt_ahead
()
{
if
$(
echo
"
$(
command
git log
origin/
$(
current_branch
)
..HEAD 2> /dev/null
)
"
|
grep
'^commit'
&> /dev/null
)
;
then
if
$(
echo
"
$(
command
git log
@
{
upstream
}
..HEAD 2> /dev/null
)
"
|
grep
'^commit'
&> /dev/null
)
;
then
echo
"
$ZSH_THEME_GIT_PROMPT_AHEAD
"
echo
"
$ZSH_THEME_GIT_PROMPT_AHEAD
"
fi
fi
}
}
# Gets the number of commits ahead from remote
function
git_commits_ahead
()
{
if
$(
echo
"
$(
command
git log @
{
upstream
}
..HEAD 2> /dev/null
)
"
|
grep
'^commit'
&> /dev/null
)
;
then
COMMITS
=
$(
command
git log @
{
upstream
}
..HEAD |
grep
'^commit'
|
wc
-l
|
tr
-d
' '
)
echo
"
$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX
"
fi
}
# Formats prompt string for current git commit short SHA
# Formats prompt string for current git commit short SHA
function
git_prompt_short_sha
()
{
function
git_prompt_short_sha
()
{
SHA
=
$(
command
git rev-parse
--short
HEAD 2> /dev/null
)
&&
echo
"
$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER
"
SHA
=
$(
command
git rev-parse
--short
HEAD 2> /dev/null
)
&&
echo
"
$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER
"
...
...
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