Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Mon, 19 May 2008 21:56:31 +0000 (22:56 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 19 May 2008 21:56:31 +0000 (22:56 +0100)
1  2 
contrib/stgit-completion.bash
stgit/commands/export.py

Simple merge
@@@ -88,9 -89,15 +88,10 @@@ def func(parser, options, args)
              os.makedirs(dirname)
          series = file(os.path.join(dirname, 'series'), 'w+')
  
 -    if options.diff_opts:
 -        diff_flags = options.diff_opts.split()
 -    else:
 -        diff_flags = []
 -
      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