diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-09 20:30:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-09 20:30:19 (GMT) |
| commit | faf8fde514df5b5ddd529ec5a89973f1961c5281 (patch) | |
| tree | 5f91a566720515dd386c97b16e7e43f9cbb03102 /sequencer.c | |
| parent | 9b795193a6a7e963db62d9cd8e86752a40940520 (diff) | |
| parent | 7c0b0d8deae040969d78eb141d899e225f1577e6 (diff) | |
| download | git-faf8fde514df5b5ddd529ec5a89973f1961c5281.zip git-faf8fde514df5b5ddd529ec5a89973f1961c5281.tar.gz git-faf8fde514df5b5ddd529ec5a89973f1961c5281.tar.bz2 | |
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
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index cf8fbeb..ab6f8a7 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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); } |