Only check for upstream merges if not fast-forwarding

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index ed71f744f6a22b54cf382deb313fc72fb01ac94f..674d8c10fb99878c2cc358537a3af4e249c9ada5 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -171,7 +171,7 @@ def push_patches(patches, check_merged = False):
     names = patches[forwarded:]
 
     # check for patches merged upstream
-    if check_merged:
+    if names and check_merged:
         print 'Checking for patches merged upstream...',
         sys.stdout.flush()