mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'mg/cherry-pick-multi-on-unborn'
"git cherry-pick A" worked on an unborn branch, but "git cherry-pick A..B" didn't. * mg/cherry-pick-multi-on-unborn: cherry-pick: allow to pick to unborn branches
This commit is contained in:
commit
db8128fee0
11
sequencer.c
11
sequencer.c
|
@ -888,6 +888,10 @@ static int sequencer_rollback(struct replay_opts *opts)
|
|||
git_path_head_file());
|
||||
goto fail;
|
||||
}
|
||||
if (is_null_sha1(sha1)) {
|
||||
error(_("cannot abort from a branch yet to be born"));
|
||||
goto fail;
|
||||
}
|
||||
if (reset_for_rollback(sha1))
|
||||
goto fail;
|
||||
remove_sequencer_state();
|
||||
|
@ -1086,11 +1090,8 @@ int sequencer_pick_revisions(struct replay_opts *opts)
|
|||
walk_revs_populate_todo(&todo_list, opts);
|
||||
if (create_seq_dir() < 0)
|
||||
return -1;
|
||||
if (get_sha1("HEAD", sha1)) {
|
||||
if (opts->action == REPLAY_REVERT)
|
||||
return error(_("Can't revert as initial commit"));
|
||||
return error(_("Can't cherry-pick into empty head"));
|
||||
}
|
||||
if (get_sha1("HEAD", sha1) && (opts->action == REPLAY_REVERT))
|
||||
return error(_("Can't revert as initial commit"));
|
||||
save_head(sha1_to_hex(sha1));
|
||||
save_opts(opts);
|
||||
return pick_commits(todo_list, opts);
|
||||
|
|
Loading…
Reference in a new issue