revert: do not remove state until sequence is finished

[thirdparty/git.git] / builtin / revert.c

diff --git a/builtin/revert.c b/builtin/revert.c
index 5785ff9941e698eee7b6e480676a411d52076078..5dcfa6ba69e5fec5a2cc32aac018213ec678a73b 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -1018,18 +1018,8 @@ 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 (!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);
+               if (res)
                        return res;
-               }
        }
 
        /*