summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-09 13:30:19 -0700
committerJunio C Hamano <gitster@pobox.com>2013-05-09 13:30:19 -0700
commitfaf8fde514df5b5ddd529ec5a89973f1961c5281 (patch)
tree5f91a566720515dd386c97b16e7e43f9cbb03102
parent9b795193a6a7e963db62d9cd8e86752a40940520 (diff)
parent7c0b0d8deae040969d78eb141d899e225f1577e6 (diff)
downloadgit-faf8fde514df5b5ddd529ec5a89973f1961c5281.tar.gz
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
-rw-r--r--sequencer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c
index cf8fbeb8d5..ab6f8a722d 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);
}