development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

* mv/sequencer-pick-error-diag:
  cherry-pick: make sure all input objects are commits
This commit is contained in:
Junio C Hamano 2013-04-19 13:40:22 -07:00
parent 8d41addacb 21246dbb9e
commit 4407ea49fe
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sequencer.c
View file

@ -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 /

6
t/t3508-cherry-pick-many-commits.sh
View file

@ -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