X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a34b42e809fab42d08f92fed47d1e2f4226a50fb..514dd4f2a4bc2cb0fb2e160f254804361486f3df:/stgit/commands/pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 843b579..227249e 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -39,6 +39,9 @@ format."""
 
 options = [make_option('-n', '--nopush',
                        help = 'do not push the patches back after pulling',
+                       action = 'store_true'),
+           make_option('-m', '--merged',
+                       help = 'check for patches merged upstream',
                        action = 'store_true')]
 
 def func(parser, options, args):
@@ -75,15 +78,12 @@ def func(parser, options, args):
     print 'done'
 
     # push the patches back
-    if options.nopush:
-        applied = []
-    for p in applied:
-        print 'Pushing patch "%s"...' % p,
-        sys.stdout.flush()
-        crt_series.push_patch(p)
-        if crt_series.empty_patch(p):
-            print 'done (empty patch)'
-        else:
-            print 'done'
+    if not options.nopush:
+        push_patches(applied, options.merged)
+
+    # maybe tidy up
+    repack = config.get('stgit', 'keepoptimized')
+    if repack == 'yes':
+        git.repack()
 
     print_crt_patch()