diff options
| author |  Miklos Vajna <vmiklos@suse.cz> | 2013-04-11 15:06:52 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-11 09:54:25 -0700 |
| commit | 21246dbb9e0af278bc671e32e45a6cae4ad38b6f (patch) | |
| tree | 189bf00464a90b6bbd13efa2a186faccb17fe904 | |
| parent | remote-bzr: improve tag handling (diff) | |
| download | tgif-21246dbb9e0af278bc671e32e45a6cae4ad38b6f.tar.xz | |
cherry-pick: make sure all input objects are commits
When a single argument was a non-commit, the error message used to be:
fatal: BUG: expected exactly one commit from walk
For multiple arguments, when none of the arguments was a commit, the error was:
fatal: empty commit set passed
Finally, when some of the arguments were non-commits, we ignored those
arguments. Fix this bug and make sure all arguments are commits, and
for the first non-commit, error out with:
fatal: <name>: Can't cherry-pick a <type>
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sequencer.c | 18 | ||||
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 6 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index baa031052e..61fdb6805c 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 / diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 4e7136b837..19c99d7ef1 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -55,6 +55,12 @@ one two" ' +test_expect_success 'cherry-pick three one two: fails' ' + git checkout -f master && + git reset --hard first && + test_must_fail git cherry-pick three one two: +' + test_expect_success 'output to keep user entertained during multi-pick' ' cat <<-\EOF >expected && [master OBJID] second |