Skip to content

Commit 7c0b0d8

Browse files
committed
cherry-pick: picking a tag that resolves to a commit is OK
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 <[email protected]>
1 parent 21246db commit 7c0b0d8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sequencer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,10 +1077,10 @@ int sequencer_pick_revisions(struct replay_opts *opts)
10771077
continue;
10781078

10791079
if (!get_sha1(name, sha1)) {
1080-
enum object_type type = sha1_object_info(sha1, NULL);
1081-
1082-
if (type > 0 && type != OBJ_COMMIT)
1080+
if (!lookup_commit_reference_gently(sha1, 1)) {
1081+
enum object_type type = sha1_object_info(sha1, NULL);
10831082
die(_("%s: can't cherry-pick a %s"), name, typename(type));
1083+
}
10841084
} else
10851085
die(_("%s: bad revision"), name);
10861086
}

0 commit comments

Comments
 (0)