From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Thu, 17 Apr 2008 20:50:14 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~246
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/d851da81409f07105c55d5088157e276cbc4fe13?hp=352446d45ea5eddb05d77179eeb94cec424587c7

Merge branch 'stable'
---

diff --git a/stgit/commands/sync.py b/stgit/commands/sync.py
index 35c5c31..0e2c18f 100644
--- a/stgit/commands/sync.py
+++ b/stgit/commands/sync.py
@@ -136,11 +136,13 @@ def func(parser, options, args):
         to_pop = applied[applied.index(first_patch) + 1:]
         if to_pop:
             pop_patches(crt_series, to_pop[::-1])
+        pushed = [first_patch]
     else:
         to_pop = []
+        pushed = []
     popped = to_pop + [p for p in patches if p in unapplied]
 
-    for p in [first_patch] + popped:
+    for p in pushed + popped:
         if p in popped:
             # push this patch
             push_patches(crt_series, [p])