dash doesn't do curly brace expansion, so avoid that

[stgit] / contrib / stgit-completion.bash

diff --git a/contrib/stgit-completion.bash b/contrib/stgit-completion.bash
index 8c50cbc..3c3bf92 100644 (file)
--- a/contrib/stgit-completion.bash
+++ b/contrib/stgit-completion.bash
@@ -15,16 +15,19 @@ _stg_commands="
     applied
     assimilate
     branch
+    bury
     delete
     diff
     clean
     clone
     commit
+    cp
     export
     files
     float
     fold
     goto
+    hide
     id
     import
     init
@@ -36,6 +39,7 @@ _stg_commands="
     pop
     pull
     push
+    rebase
     refresh
     rename
     resolved
@@ -47,6 +51,7 @@ _stg_commands="
     top
     unapplied
     uncommit
+    unhide
 "
 
 # The path to .git, or empty if we're not in a repository.
@@ -90,13 +95,13 @@ _all_other_patches ()
     local b=$(_current_branch)
     local g=$(_gitdir)
     [ "$g" ] && cat "$g/patches/$b/applied" "$g/patches/$b/unapplied" \
-        | grep -v "^$(< $g/patches/$b/current)$"
+        | grep -v "^$(cat $g/patches/$b/current 2> /dev/null)$"
 }
 
 # List the command options
 _cmd_options ()
 {
-    stg $1 --help | grep -e " --[A-Za-z]" | sed -e "s/.*\(--[^ =]\+\).*/\1/"
+    stg $1 --help 2>/dev/null | grep -e " --[A-Za-z]" | sed -e "s/.*\(--[^ =]\+\).*/\1/"
 }
 
 # Generate completions for patches and patch ranges from the given
@@ -185,16 +190,20 @@ _stg ()
         # repository commands
         id)     _stg_patches $command _all_patches ;;
         # stack commands
+        bury)   _stg_patches $command _all_patches ;;
         float)  _stg_patches $command _all_patches ;;
         goto)   _stg_patches $command _all_other_patches ;;
+        hide)   _stg_patches $command _all_patches ;;
         pop)    _stg_patches $command _applied_patches ;;
         push)   _stg_patches $command _unapplied_patches ;;
+        series) _stg_patches $command _all_patches ;;
+        unhide) _stg_patches $command _all_patches ;;
         # patch commands
         delete) _stg_patches $command _all_patches ;;
         export) _stg_patches $command _applied_patches ;;
         files)  _stg_patches $command _all_patches ;;
         log)    _stg_patches $command _all_patches ;;
-        mail)   _stg_patches $command _applied_patches ;;
+        mail)   _stg_patches $command _all_patches ;;
         pick)   _stg_patches $command _unapplied_patches ;;
         refresh)_stg_patches_options $command _applied_patches "-p --patch" ;;
         rename) _stg_patches $command _all_patches ;;