From: Junio C Hamano Date: Fri, 19 Apr 2013 20:40:22 +0000 (-0700) Subject: Merge branch 'mv/sequencer-pick-error-diag' X-Git-Tag: v1.8.3-rc0~43 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4407ea49fe47e90953f187279d55eb93f89a3530?ds=inline;hp=-c 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 --- 4407ea49fe47e90953f187279d55eb93f89a3530 diff --combined sequencer.c index ee4f8c6ed4,61fdb6805c..cf8fbeb8d5 --- a/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 ", just * cherry-pick/revert it, set CHERRY_PICK_HEAD /