subversion-1.9.7HEADsubversion-1.9.7master

1 files changed, 6 insertions, 2 deletions

diff --git a/tools/client-side/bash_completion_test b/tools/client-side/bash_completion_test
index 49e3532..d2c1785 100755
--- a/tools/client-side/bash_completion_test
+++ b/tools/client-side/bash_completion_test
@@ -114,14 +114,18 @@ get_svn_subcommands() {
 # Usage: get_svn_options SUBCMD
 get_svn_options() {
   { svn help "$1" |
+      # Remove deprecated options
+      grep -v deprecated |
       # Find the relevant lines; remove "arg" and description.
       sed -n -e '1,/^Valid options:$/d;/^  -/!d' \
              -e 's/\( ARG\)* * : .*//;p' |
       # Remove brackets; put each word on its own line.
       tr -d '] ' | tr '[' '\n'
     # The following options are always accepted but not listed in the help
-    echo "-h"
-    echo "--help"
+    if [ "$1" != "help" ] ; then
+      echo "-h"
+      echo "--help"
+    fi
   } | sort
   
 }