diff options
| -rw-r--r-- | builtin/revert.c | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 308c1ce2ed..f088e1cc71 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -727,11 +727,9 @@ static void save_opts(struct replay_opts *opts) } } -static int pick_commits(struct replay_opts *opts) +static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts) { - struct commit_list *todo_list = NULL; struct strbuf buf = STRBUF_INIT; - unsigned char sha1[20]; struct commit_list *cur; int res; @@ -741,16 +739,6 @@ static int pick_commits(struct replay_opts *opts) opts->record_origin || opts->edit)); read_and_refresh_cache(opts); - walk_revs_populate_todo(&todo_list, opts); - create_seq_dir(); - if (get_sha1("HEAD", sha1)) { - if (opts->action == REVERT) - die(_("Can't revert as initial commit")); - die(_("Can't cherry-pick into empty head")); - } - save_head(sha1_to_hex(sha1)); - save_opts(opts); - for (cur = todo_list; cur; cur = cur->next) { save_todo(cur, opts); res = do_pick_commit(cur->item, opts); @@ -768,6 +756,31 @@ static int pick_commits(struct replay_opts *opts) return 0; } +static int pick_revisions(struct replay_opts *opts) +{ + struct commit_list *todo_list = NULL; + unsigned char sha1[20]; + + read_and_refresh_cache(opts); + + /* + * Decide what to do depending on the arguments; a fresh + * cherry-pick should be handled differently from an existing + * one that is being continued + */ + walk_revs_populate_todo(&todo_list, opts); + create_seq_dir(); + if (get_sha1("HEAD", sha1)) { + if (opts->action == REVERT) + die(_("Can't revert as initial commit")); + die(_("Can't cherry-pick into empty head")); + } + save_head(sha1_to_hex(sha1)); + save_opts(opts); + + return pick_commits(todo_list, opts); +} + int cmd_revert(int argc, const char **argv, const char *prefix) { struct replay_opts opts; @@ -778,7 +791,7 @@ int cmd_revert(int argc, const char **argv, const char *prefix) opts.action = REVERT; git_config(git_default_config, NULL); parse_args(argc, argv, &opts); - return pick_commits(&opts); + return pick_revisions(&opts); } int cmd_cherry_pick(int argc, const char **argv, const char *prefix) @@ -789,5 +802,5 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix) opts.action = CHERRY_PICK; git_config(git_default_config, NULL); parse_args(argc, argv, &opts); - return pick_commits(&opts); + return pick_revisions(&opts); } |