From 6d248aced4351b3e0a19e26fae65ca400a7d2884 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Mon, 12 Mar 2007 22:44:20 +0000
Subject: [PATCH] Only check for upstream merges if not fast-forwarding

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---
 stgit/commands/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index ed71f74..674d8c1 100644
--- 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()
 
-- 
2.11.4.GIT