From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Fri, 11 Nov 2005 10:12:46 +0000 (+0000)
Subject: Fix the --name option for the pick command
X-Git-Tag: v0.8~26
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/9a6e2cc3e43ca33cee2f069b28cb8029e3a127cc

Fix the --name option for the pick command

If a patch name from a different branch is given, the --name option is
ignored.

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

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'