From: Felipe Contreras Date: Thu, 24 Apr 2014 02:44:47 GMT Subject: [PATCH v7 08/12] cherry-pick: don't store skipped commit Message-ID: <1398307491-21314-9-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1398307491-21314-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- sequencer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sequencer.c b/sequencer.c index 426fddd..fc0dd04 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1056,7 +1056,7 @@ static int continue_single_pick(void) return run_command_v_opt(argv, RUN_GIT_CMD); } -static int sequencer_continue(struct replay_opts *opts) +static int sequencer_continue(struct replay_opts *opts, int skip) { struct commit_list *todo_list = NULL; @@ -1076,7 +1076,7 @@ static int sequencer_continue(struct replay_opts *opts) } if (index_differs_from("HEAD", 0)) return error_dirty_index(opts); - if (opts->action == REPLAY_PICK) { + if (opts->action == REPLAY_PICK && !skip) { unsigned char to[20]; if (!read_ref("HEAD", to)) add_rewritten(&rewritten, todo_list->item->object.sha1, to); @@ -1104,7 +1104,7 @@ static int sequencer_skip(struct replay_opts *opts) if (ret) return ret; - return sequencer_continue(opts); + return sequencer_continue(opts, 1); } static int single_pick(struct commit *cmit, struct replay_opts *opts) @@ -1136,7 +1136,7 @@ int sequencer_pick_revisions(struct replay_opts *opts) if (opts->subcommand == REPLAY_ROLLBACK) return sequencer_rollback(opts); if (opts->subcommand == REPLAY_CONTINUE) - return sequencer_continue(opts); + return sequencer_continue(opts, 0); if (opts->subcommand == REPLAY_SKIP) return sequencer_skip(opts); -- 1.9.2+fc1.2.gfbaae8c