diff options
author | Dawid Ferenczy <dawid@ferenczy.cz> | 2015-08-25 16:34:04 +0200 |
---|---|---|
committer | Dawid Ferenczy <dawid@ferenczy.cz> | 2015-08-25 16:34:04 +0200 |
commit | 18ef1ee6481dbeca4fbecf3de627f946860ffd5a (patch) | |
tree | cb07e72538c470bb486596d955c7912c5b05e23e /plugins/svn | |
parent | eafd5f325208421b82a770e57441dd1063eb5745 (diff) | |
parent | 192de6bcffb0294e19f4203f6f7dc1a7f3e427be (diff) | |
download | zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.tar.gz zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.tar.bz2 zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.zip |
Merge remote-tracking branch 'robbyrussell/master'
Diffstat (limited to 'plugins/svn')
-rw-r--r-- | plugins/svn/svn.plugin.zsh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh index ef6da5bd3..9f7a4c6eb 100644 --- a/plugins/svn/svn.plugin.zsh +++ b/plugins/svn/svn.plugin.zsh @@ -61,7 +61,7 @@ function svn_get_rev_nr() { function svn_dirty_choose() { if in_svn; then root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'` - if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then + if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then # Grep exits with 0 when "One or more lines were selected", return "dirty". echo $1 else @@ -77,8 +77,8 @@ function svn_dirty() { function svn_dirty_choose_pwd () { if in_svn; then - root=`pwd` - if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then + root=$PWD + if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then # Grep exits with 0 when "One or more lines were selected", return "dirty". echo $1 else |