Skip to content

Commit

Permalink
Merge branch 'mv/sequencer-pick-error-diag'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed May 9, 2013
2 parents 9b79519 + 7c0b0d8 commit faf8fde
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sequencer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit faf8fde

Please sign in to comment.