Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
676fb4e4
Commit
676fb4e4
authored
Jul 03, 2014
by
Simon Buchan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix parse_git_dirty() when status.branch is set.
parent
5728a560
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
12 deletions
+9
-12
git.zsh
lib/git.zsh
+9
-12
No files found.
lib/git.zsh
View file @
676fb4e4
...
@@ -10,23 +10,20 @@ function git_prompt_info() {
...
@@ -10,23 +10,20 @@ function git_prompt_info() {
# Checks if working tree is dirty
# Checks if working tree is dirty
parse_git_dirty
()
{
parse_git_dirty
()
{
local
S
UBMODULE_SYNTAX
=
''
local
S
TATUS
=
''
local
GIT_STATUS
=
''
local
FLAGS
local
CLEAN_MESSAGE
=
'nothing to commit (working directory clean)'
FLAGS
=(
'--porcelain'
)
if
[[
"
$(
command
git config
--get
oh-my-zsh.hide-status
)
"
!=
"1"
]]
;
then
if
[[
"
$(
command
git config
--get
oh-my-zsh.hide-status
)
"
!=
"1"
]]
;
then
if
[[
$POST_1_7_2_GIT
-gt
0
]]
;
then
if
[[
$POST_1_7_2_GIT
-gt
0
]]
;
then
SUBMODULE_SYNTAX
=
"--ignore-submodules=dirty"
FLAGS+
=
'--ignore-submodules=dirty'
fi
fi
if
[[
"
$DISABLE_UNTRACKED_FILES_DIRTY
"
==
"true"
]]
;
then
if
[[
"
$DISABLE_UNTRACKED_FILES_DIRTY
"
==
"true"
]]
;
then
GIT_STATUS
=
$(
command
git status
-s
${
SUBMODULE_SYNTAX
}
-uno
2> /dev/null |
tail
-n1
)
FLAGS+
=
'--untracked-files=no'
else
GIT_STATUS
=
$(
command
git status
-s
${
SUBMODULE_SYNTAX
}
2> /dev/null |
tail
-n1
)
fi
if
[[
-n
$GIT_STATUS
]]
;
then
echo
"
$ZSH_THEME_GIT_PROMPT_DIRTY
"
else
echo
"
$ZSH_THEME_GIT_PROMPT_CLEAN
"
fi
fi
STATUS
=
$(
command
git status
${
FLAGS
}
2> /dev/null |
tail
-n1
)
fi
if
[[
-n
$STATUS
]]
;
then
echo
"
$ZSH_THEME_GIT_PROMPT_DIRTY
"
else
else
echo
"
$ZSH_THEME_GIT_PROMPT_CLEAN
"
echo
"
$ZSH_THEME_GIT_PROMPT_CLEAN
"
fi
fi
...
...
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