From d37b109f0cd11094227866c8498d274e1074a61c Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sat, 8 Nov 2008 21:18:08 +0000 Subject: [PATCH] Allow pick --fold to work without applied patches Organization: Straylight/Edgeware From: Catalin Marinas 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 --- stgit/commands/pick.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- [mdw]