Merge branch 'mv/sequencer-pick-error-diag'
Fix "git cherry-pick $annotated_tag", which was mistakenly rejected. * mv/sequencer-pick-error-diag: cherry-pick: picking a tag that resolves to a commit is OK
This commit is contained in:
commit
faf8fde514
@ -1077,10 +1077,10 @@ int sequencer_pick_revisions(struct replay_opts *opts)
|
||||
continue;
|
||||
|
||||
if (!get_sha1(name, sha1)) {
|
||||
enum object_type type = sha1_object_info(sha1, NULL);
|
||||
|
||||
if (type > 0 && type != OBJ_COMMIT)
|
||||
if (!lookup_commit_reference_gently(sha1, 1)) {
|
||||
enum object_type type = sha1_object_info(sha1, NULL);
|
||||
die(_("%s: can't cherry-pick a %s"), name, typename(type));
|
||||
}
|
||||
} else
|
||||
die(_("%s: bad revision"), name);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user