Merge branch 'mv/sequencer-pick-error-diag'

"git cherry-pick $blob $tree" is diagnosed as a nonsense.

* mv/sequencer-pick-error-diag:
cherry-pick: make sure all input objects are commits

diff --combined sequencer.c
index ee4f8c6ed4f040072b4d706c26d04a07f665c9f6,61fdb6805cd85b803f2675bef0619b04bd767314..cf8fbeb8d5ac2b6ca3b498f2115c02eeea22910a
--- 1/sequencer.c
--- 2/sequencer.c
+++ b/sequencer.c
@@@ -216,7 -216,7 +216,7 @@@ static void print_advice(int show_hint
        if (msg) {
                fprintf(stderr, "%s\n", msg);
                /*
 -               * A conflict has occured but the porcelain
 +               * A conflict has occurred but the porcelain
                 * (typically rebase --interactive) wants to take care
                 * of the commit itself so remove CHERRY_PICK_HEAD
                 */
@@@ -1047,6 -1047,7 +1047,7 @@@ int sequencer_pick_revisions(struct rep
  {
        struct commit_list *todo_list = NULL;
        unsigned char sha1[20];
+       int i;
  
        if (opts->subcommand == REPLAY_NONE)
                assert(opts->revs);
@@@ -1067,6 -1068,23 +1068,23 @@@
        if (opts->subcommand == REPLAY_CONTINUE)
                return sequencer_continue(opts);
  
+       for (i = 0; i < opts->revs->pending.nr; i++) {
+               unsigned char sha1[20];
+               const char *name = opts->revs->pending.objects[i].name;
+ 
+               /* This happens when using --stdin. */
+               if (!strlen(name))
+                       continue;
+ 
+               if (!get_sha1(name, sha1)) {
+                       enum object_type type = sha1_object_info(sha1, NULL);
+ 
+                       if (type > 0 && type != OBJ_COMMIT)
+                               die(_("%s: can't cherry-pick a %s"), name, typename(type));
+               } else
+                       die(_("%s: bad revision"), name);
+       }
+ 
        /*
         * If we were called as "git cherry-pick <commit>", just
         * cherry-pick/revert it, set CHERRY_PICK_HEAD /