From 9a6e2cc3e43ca33cee2f069b28cb8029e3a127cc Mon Sep 17 00:00:00 2001 Message-Id: <9a6e2cc3e43ca33cee2f069b28cb8029e3a127cc.1716893407.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 11 Nov 2005 10:12:46 +0000 Subject: [PATCH] Fix the --name option for the pick command Organization: Straylight/Edgeware From: Catalin Marinas If a patch name from a different branch is given, the --name option is ignored. Signed-off-by: Catalin Marinas --- stgit/commands/pick.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py index c425945..3c52a49 100644 --- a/stgit/commands/pick.py +++ b/stgit/commands/pick.py @@ -59,10 +59,10 @@ def func(parser, options, args): raise CmdException, 'No patches applied' else: patch_branch = commit_str.split('@') - if len(patch_branch) == 2: - patch = patch_branch[0] - elif options.name: + if options.name: patch = options.name + elif len(patch_branch) == 2: + patch = patch_branch[0] else: raise CmdException, 'Unkown patch name' -- [mdw]