cherry-pick: picking a tag that resolves to a commit is OK

diff --git a/sequencer.c b/sequencer.c
index 61fdb6805cd85b803f2675bef0619b04bd767314..f2c9d98f8f5cd3f3ff55444a8c76a3a7f00be9ec 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1077,10 +1077,10 @@ int sequencer_pick_revisions(struct replay_opts *opts)
                        continue;
 
                if (!get_sha1(name, sha1)) {
-                       enum object_type type = sha1_object_info(sha1, NULL);
-
-                       if (type > 0 && type != OBJ_COMMIT)
+                       if (!lookup_commit_reference_gently(sha1, 1)) {
+                               enum object_type type = sha1_object_info(sha1, NULL);
                                die(_("%s: can't cherry-pick a %s"), name, typename(type));
+                       }
                } else
                        die(_("%s: bad revision"), name);
        }