diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/revert.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index a8accd6c7a..000806c7c4 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -763,8 +763,18 @@ static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts) for (cur = todo_list; cur; cur = cur->next) { save_todo(cur, opts); res = do_pick_commit(cur->item, opts); - if (res) + if (res) { + if (!cur->next) + /* + * An error was encountered while + * picking the last commit; the + * sequencer state is useless now -- + * the user simply needs to resolve + * the conflict and commit + */ + remove_sequencer_state(0); return res; + } } /* |