X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/c70a7b27b0804ff978947be823effc6c954ea6a6..d714caa15d396f32cf8152a82a0e0a0e505cdf38:/stgit/commands/pick.py

diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index c63982b..1f7c84b 100644
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -169,12 +169,12 @@ def func(parser, options, args):
         patches = parse_patches(args, applied + unapplied, len(applied))
         commit_id = None
     except CmdException:
-        if len(args) >= 1:
+        if len(args) > 1:
             raise
         # no patches found, try a commit id
         commit_id = git_id(remote_series, args[0])
 
-    if len(patches) > 1:
+    if not commit_id and len(patches) > 1:
         if options.name:
             raise CmdException, '--name can only be specified with one patch'
         if options.parent: