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

revert: give --continue handling its own function

Browse Source 
This makes pick_revisions() a little shorter and easier to read
straight through.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2011-12-10 06:47:36 -06:00 committed by Junio C Hamano
parent b15aa973b2
commit 1df9bf46d6
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
builtin/revert.c
View File

@ -1038,6 +1038,21 @@ static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts)
return 0; return 0;
} }
static int sequencer_continue(struct replay_opts *opts)
{
struct commit_list *todo_list = NULL;
if (!file_exists(git_path(SEQ_TODO_FILE)))
return error(_("No %s in progress"), action_name(opts));
read_populate_opts(&opts);
read_populate_todo(&todo_list, opts);
/* Verify that the conflict has been resolved */
if (!index_differs_from("HEAD", 0))
todo_list = todo_list->next;
return pick_commits(todo_list, opts);
}
static int pick_revisions(struct replay_opts *opts) static int pick_revisions(struct replay_opts *opts)
{ {
struct commit_list *todo_list = NULL; struct commit_list *todo_list = NULL;
@ -1056,17 +1071,8 @@ static int pick_revisions(struct replay_opts *opts)
} }
if (opts->subcommand == REPLAY_ROLLBACK) if (opts->subcommand == REPLAY_ROLLBACK)
return sequencer_rollback(opts); return sequencer_rollback(opts);
if (opts->subcommand == REPLAY_CONTINUE) { if (opts->subcommand == REPLAY_CONTINUE)
if (!file_exists(git_path(SEQ_TODO_FILE))) return sequencer_continue(opts);
return error(_("No %s in progress"), action_name(opts));
read_populate_opts(&opts);
read_populate_todo(&todo_list, opts);
/* Verify that the conflict has been resolved */
if (!index_differs_from("HEAD", 0))
todo_list = todo_list->next;
return pick_commits(todo_list, opts);
}
/* /*
* Start a new cherry-pick/ revert sequence; but * Start a new cherry-pick/ revert sequence; but