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
4a9cd68e
Commit
4a9cd68e
authored
Nov 06, 2019
by
Marc Cornellà
Browse files
Merge branch 'jokester/override--ignore-submodules' (#2214)
Closes #2214
parents
0ec59e25
b7e37cea
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/git.zsh
View file @
4a9cd68e
...
@@ -17,6 +17,16 @@ function parse_git_dirty() {
...
@@ -17,6 +17,16 @@ function parse_git_dirty() {
if
[[
"
$DISABLE_UNTRACKED_FILES_DIRTY
"
==
"true"
]]
;
then
if
[[
"
$DISABLE_UNTRACKED_FILES_DIRTY
"
==
"true"
]]
;
then
FLAGS+
=
'--untracked-files=no'
FLAGS+
=
'--untracked-files=no'
fi
fi
case
"
$GIT_STATUS_IGNORE_SUBMODULES
"
in
git
)
# let git decide (this respects per-repo config in .gitmodules)
;;
*
)
# if unset: ignore dirty submodules
# other values are passed to --ignore-submodules
FLAGS+
=
"--ignore-submodules=
${
GIT_STATUS_IGNORE_SUBMODULES
:-
dirty
}
"
;;
esac
STATUS
=
$(
command
git status
${
FLAGS
}
2> /dev/null |
tail
-n1
)
STATUS
=
$(
command
git status
${
FLAGS
}
2> /dev/null |
tail
-n1
)
fi
fi
if
[[
-n
$STATUS
]]
;
then
if
[[
-n
$STATUS
]]
;
then
...
...
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