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.
This commit is contained in:
commit
dee8171fa9
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue