[PATCH v5 17/36] cherry-pick: don't store skipped commit
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- builtin/sequencer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/sequencer.c b/builtin/sequencer.c
index 24034f2..d40fda9 100644
--- a/builtin/sequencer.c
+++ b/builtin/sequencer.c@@ -953,7 +953,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;
@@ -973,7 +973,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);
@@ -1001,7 +1001,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)
@@ -1033,7 +1033,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.8.3.698.g079b096