Skip to content

O
oh-my-zsh
Commit dee8171f authored by Robby Russell's avatar Robby Russell
Browse files
Options

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.
parents 4ff45581 7b25a3fc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
plugins/svn/svn.plugin.zsh
View file @ dee8171f
function svn_prompt_info { function svn_prompt_info {
if [[ -d .svn ]]; then if [ in_svn ]; then
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\ 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" $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 fi
...@@ -28,7 +28,7 @@ function svn_get_rev_nr { ...@@ -28,7 +28,7 @@ function svn_get_rev_nr {
function svn_dirty_choose { function svn_dirty_choose {
if [ in_svn ]; then if [ in_svn ]; then
s=$(svn status 2>/dev/null) s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
if [ $s ]; then if [ $s ]; then
echo $1 echo $1
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment