Merge branch 'stable'

diff --git a/contrib/stgit-completion.bash b/contrib/stgit-completion.bash
index b02eb64d1ced5e70feae395b67e6714c7a00c5bb..1867e6bd5de20d5311963984f838a6335dcdc232 100644 (file)
--- a/contrib/stgit-completion.bash
+++ b/contrib/stgit-completion.bash
@@ -251,7 +251,7 @@ _stg ()
         # patch commands
         delete) _stg_patches $command _all_patches ;;
         edit)   _stg_patches $command _applied_patches ;;
-        export) _stg_patches $command _applied_patches ;;
+        export) _stg_patches $command _all_patches ;;
         files)  _stg_patches $command _all_patches ;;
         log)    _stg_patches $command _all_patches ;;
         mail)   _stg_patches $command _all_patches ;;

diff --git a/stgit/commands/export.py b/stgit/commands/export.py
index 50f6f671a979ef7bca12fa2900ada64679546670..6ebfd2aecf910d0d151d0fdff13f23df2ba0a2df 100644 (file)
--- a/stgit/commands/export.py
+++ b/stgit/commands/export.py
@@ -89,8 +89,9 @@ def func(parser, options, args):
         series = file(os.path.join(dirname, 'series'), 'w+')
 
     applied = crt_series.get_applied()
+    unapplied = crt_series.get_unapplied()
     if len(args) != 0:
-        patches = parse_patches(args, applied)
+        patches = parse_patches(args, applied + unapplied, len(applied))
     else:
         patches = applied