diff options
| author | Robby Russell <robby@planetargon.com> | 2014-12-14 16:32:11 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-12-14 16:32:11 -0800 |
| commit | eced76e0fd80e6ca3908fb50b7e29c6beb4fad8b (patch) | |
| tree | 4647cececb4c7369a63b5a1f77f3cbc1c0b4a2e5 /plugins/svn/svn.plugin.zsh | |
| parent | 311f3630d4752139524941298371f9623d493b31 (diff) | |
| parent | 00ec11d3c0a2b2b7413ad84940ddec299aafbb04 (diff) | |
| download | zsh-eced76e0fd80e6ca3908fb50b7e29c6beb4fad8b.tar.gz zsh-eced76e0fd80e6ca3908fb50b7e29c6beb4fad8b.tar.bz2 zsh-eced76e0fd80e6ca3908fb50b7e29c6beb4fad8b.zip | |
Merge pull request #3326 from DanielFGray/master
ignore any grep aliases that might be defined
Diffstat (limited to 'plugins/svn/svn.plugin.zsh')
| -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 ba281d790..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 @@ -78,7 +78,7 @@ 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 + 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 |