Use FETCH_HEAD to know where to rebase to after pull.

[stgit] / contrib / stgit-completion.bash

diff --git a/contrib/stgit-completion.bash b/contrib/stgit-completion.bash
index 1474b4b3ef3cda215661aedfaf9641a09554789c..8a027bff2525dc11f98bd93b61ecfa7a9c2eae56 100644 (file)
--- a/contrib/stgit-completion.bash
+++ b/contrib/stgit-completion.bash
@@ -25,6 +25,7 @@ _stg_commands="
     float
     fold
     goto
     float
     fold
     goto

+    hide

     id
     import
     init
     id
     import
     init


@@ -36,6 +37,7 @@ _stg_commands="
     pop
     pull
     push
     pop
     pull
     push

+    rebase

     refresh
     rename
     resolved
     refresh
     rename
     resolved


@@ -47,6 +49,7 @@ _stg_commands="
     top
     unapplied
     uncommit
     top
     unapplied
     uncommit

+    unhide

 "
 
 # The path to .git, or empty if we're not in a repository.
 "
 
 # The path to .git, or empty if we're not in a repository.


@@ -90,7 +93,7 @@ _all_other_patches ()
     local b=$(_current_branch)
     local g=$(_gitdir)
     [ "$g" ] && cat "$g/patches/$b/applied" "$g/patches/$b/unapplied" \
     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
 }
 
 # List the command options


@@ -187,8 +190,11 @@ _stg ()
         # stack commands
         float)  _stg_patches $command _all_patches ;;
         goto)   _stg_patches $command _all_other_patches ;;
         # stack commands
         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 ;;
         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 ;;
         # patch commands
         delete) _stg_patches $command _all_patches ;;
         export) _stg_patches $command _applied_patches ;;