mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mv/sequencer-pick-error-diag'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2013-05-09 13:30:19 -07:00
parent 9b795193a6 7c0b0d8dea
commit faf8fde514
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sequencer.c
View File

@ -1077,10 +1077,10 @@ int sequencer_pick_revisions(struct replay_opts *opts)
continue; continue;
if (!get_sha1(name, sha1)) { if (!get_sha1(name, sha1)) {
enum object_type type = sha1_object_info(sha1, NULL); if (!lookup_commit_reference_gently(sha1, 1)) {
enum object_type type = sha1_object_info(sha1, NULL);
if (type > 0 && type != OBJ_COMMIT)
die(_("%s: can't cherry-pick a %s"), name, typename(type)); die(_("%s: can't cherry-pick a %s"), name, typename(type));
}
} else } else
die(_("%s: bad revision"), name); die(_("%s: bad revision"), name);
} }