From: Johannes Schindelin Date: Mon, 02 Jan 2017 15:28:20 GMT Subject: [PATCH v3 24/38] sequencer (rebase -i): record interrupted commits in rewritten, too Message-ID: <90682e922832844663a761eaf96885f255a405d9.1483370556.git.johannes.schindelin@gmx.de> In-Reply-To: When continuing after a `pick` command failed, we want that commit to show up in the rewritten-list (and its notes to be rewritten), too. Signed-off-by: Johannes Schindelin --- sequencer.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sequencer.c b/sequencer.c index 50380a15b8..d7273fd1b3 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2060,6 +2060,14 @@ int sequencer_continue(struct replay_opts *opts) goto release_todo_list; } todo_list.current++; + } else if (file_exists(rebase_path_stopped_sha())) { + struct strbuf buf = STRBUF_INIT; + struct object_id oid; + + if (read_oneliner(&buf, rebase_path_stopped_sha(), 1) && + !get_sha1_committish(buf.buf, oid.hash)) + record_in_rewritten(&oid, peek_command(&todo_list, 0)); + strbuf_release(&buf); } res = pick_commits(&todo_list, opts); -- 2.11.0.rc3.windows.1