Avoid contrib/stg-swallow deleting unrelated empty patches.

[stgit] / stgit / commands / refresh.py

diff --git a/stgit/commands/refresh.py b/stgit/commands/refresh.py
index 0efe1df..4cf09ae 100644 (file)
--- a/stgit/commands/refresh.py
+++ b/stgit/commands/refresh.py
@@ -77,7 +77,7 @@ options = [make_option('-f', '--force',
 
 
 def func(parser, options, args):
-    autoresolved = config.get('stgit', 'autoresolved')
+    autoresolved = config.get('stgit.autoresolved')
 
     if autoresolved != 'yes':
         check_conflicts()
@@ -144,7 +144,10 @@ def func(parser, options, args):
                                  committer_email = options.commemail,
                                  backup = True, sign_str = sign_str)
 
-        print 'done'
+        if crt_series.empty_patch(patch):
+            print 'done (empty patch)'
+        else:
+            print 'done'
 
         if options.patch:
             between.reverse()