From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sat, 8 Nov 2008 21:18:08 +0000 (+0000)
Subject: Allow pick --fold to work without applied patches
X-Git-Tag: v0.15-rc1~102^2~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/d37b109f0cd11094227866c8498d274e1074a61c?ds=inline;hp=0aa48e801c7093e3270c7e22042aa7ff74ce939b

Allow pick --fold to work without applied patches

This patch fixes bug #12517. While there may be other variants for
achieving the same, it makes sense not to restrict the --fold option.

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

diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index 760918b..0fc54b8 100644
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -177,7 +177,7 @@ def func(parser, options, args):
         if options.parent:
             raise CmdException, '--parent can only be specified with one patch'
 
-    if (options.fold or options.update) and not crt_series.get_current():
+    if options.update and not crt_series.get_current():
         raise CmdException, 'No patches applied'
 
     if commit_id: