Skip to content

Commit

Permalink
cherry-pick: picking a tag that resolves to a commit is OK
Browse files Browse the repository at this point in the history
Earlier, 21246db (cherry-pick: make sure all input objects are
commits, 2013-04-11) tried to catch an unlikely "git cherry-pick $blob"
as an error, but broke a more important use case to cherry-pick a
tag that points at a commit.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed May 9, 2013
1 parent 21246db commit 7c0b0d8
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 7c0b0d8

Please sign in to comment.