diff options
| author | Robby Russell <robby@planetargon.com> | 2011-07-27 21:11:49 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-07-27 21:11:49 -0700 |
| commit | dee8171fa9494d1aa6c01cb86de1b70b480ee5c4 (patch) | |
| tree | 92f98c5a164272d2ef5790ac9204074f059d69de | |
| parent | 4ff45581de9c6f993eae537cc82b0c4c65239b89 (diff) | |
| parent | 7b25a3fca90e31f2c272fd8d2ef1dfa3e61dc9e4 (diff) | |
| download | zsh-dee8171fa9494d1aa6c01cb86de1b70b480ee5c4.tar.gz zsh-dee8171fa9494d1aa6c01cb86de1b70b480ee5c4.tar.bz2 zsh-dee8171fa9494d1aa6c01cb86de1b70b480ee5c4.zip | |
Merge pull request #494 from EspadaV8/master
Fixed an issue where the SVN plugin would mark a folder as being dirty when there was an svn:external set.
| -rw-r--r-- | plugins/svn/svn.plugin.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh index 86050227d..53a8a513a 100644 --- a/plugins/svn/svn.plugin.zsh +++ b/plugins/svn/svn.plugin.zsh @@ -1,5 +1,5 @@ function svn_prompt_info { - if [[ -d .svn ]]; then + if [ in_svn ]; then echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\ $ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR" fi @@ -28,7 +28,7 @@ function svn_get_rev_nr { function svn_dirty_choose { if [ in_svn ]; then - s=$(svn status 2>/dev/null) + s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null) if [ $s ]; then echo $1 else |