Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Resolving conflict when merging in 1570

  • Loading branch information...
commit 7cdb6d667c12ff4944d7e68eb519cc5bd6735bc3 2 parents d6a36b1 + 9245a30
@robbyrussell authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 lib/git.zsh
View
8 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

This change stops dirty prompt displaying at all on my machine. If I manually revert this commit then it works fine.

@marcqualie is correct. This change breaks functionality by preventing untracked files from ever showing dirty prompt, even when $DISABLE_UNTRACKED_FILES_DIRTY is false. It basically overrides the preceeding 5 lines of code. Can this change be reverted? I don't see what was wrong with it before.

+1 on this. The merge conflict was incorrectly resolved here. The original code already fixed issue #1570, using the DISABLE_UNTRACKED_FILES_DIRTY variable instead.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
@marcqualie

This change stops dirty prompt displaying at all on my machine. If I manually revert this commit then it works fine.

@monkeyhybrid

@marcqualie is correct. This change breaks functionality by preventing untracked files from ever showing dirty prompt, even when $DISABLE_UNTRACKED_FILES_DIRTY is false. It basically overrides the preceeding 5 lines of code. Can this change be reverted? I don't see what was wrong with it before.

@cederberg

+1 on this. The merge conflict was incorrectly resolved here. The original code already fixed issue #1570, using the DISABLE_UNTRACKED_FILES_DIRTY variable instead.

Please sign in to comment.
Something went wrong with that request. Please try again.