global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-27 10:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

sequencer (rebase -i): record interrupted commits in rewritten, too

Browse Source 
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 <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-04-08 17:30:25 +02:00
parent dc97ac4a05
commit 2c3a77f533
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sequencer.c
View File

@@ -2027,6 +2027,17 @@ int sequencer_continue(struct replay_opts *opts)
}
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)) {
if (!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);
release_todo_list: