summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-19 13:40:22 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-19 13:40:23 -0700
commit4407ea49fe47e90953f187279d55eb93f89a3530 (patch)
tree14c847d0a6b6f48ef68c1c7ebfcb94f29238bf94 /sequencer.c
parent8d41addacbf210038f929dfad4b0c7829392366c (diff)
parent21246dbb9e0af278bc671e32e45a6cae4ad38b6f (diff)
downloadgit-4407ea49fe47e90953f187279d55eb93f89a3530.tar.gz
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
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c
index ee4f8c6ed4..cf8fbeb8d5 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1047,6 +1047,7 @@ int sequencer_pick_revisions(struct replay_opts *opts)
{
struct commit_list *todo_list = NULL;
unsigned char sha1[20];
+ int i;
if (opts->subcommand == REPLAY_NONE)
assert(opts->revs);
@@ -1067,6 +1068,23 @@ int sequencer_pick_revisions(struct replay_opts *opts)
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 /