diff options
| author | Robby Russell <robby@planetargon.com> | 2013-04-23 20:21:18 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-04-23 20:21:18 -0700 |
| commit | 7cdb6d667c12ff4944d7e68eb519cc5bd6735bc3 (patch) | |
| tree | ed74806973dd71d9cbb4c533ce02870c9d98f707 /lib/git.zsh | |
| parent | d6a36b175646fa2a79466f050b07d47c2342b75e (diff) | |
| parent | 9245a3086843c20ef1880f6d26720db73d5c724d (diff) | |
| download | zsh-7cdb6d667c12ff4944d7e68eb519cc5bd6735bc3.tar.gz zsh-7cdb6d667c12ff4944d7e68eb519cc5bd6735bc3.tar.bz2 zsh-7cdb6d667c12ff4944d7e68eb519cc5bd6735bc3.zip | |
Resolving conflict when merging in 1570
Diffstat (limited to 'lib/git.zsh')
| -rw-r--r-- | lib/git.zsh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index b023c9ac3..96598cf5f 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -14,20 +14,20 @@ parse_git_dirty() { if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then if [[ $POST_1_7_2_GIT -gt 0 ]]; then SUBMODULE_SYNTAX="--ignore-submodules=dirty" - fi + fi if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1) else GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1) fi - if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then + if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null) ]]; then echo "$ZSH_THEME_GIT_PROMPT_DIRTY" else echo "$ZSH_THEME_GIT_PROMPT_CLEAN" - fi + fi else echo "$ZSH_THEME_GIT_PROMPT_CLEAN" - fi + fi } # get the difference between the local and remote branches |