[PATCH 12/34] sequencer (rebase -i): skip some revert/cherry-pick specific code path

[Johannes Schindelin]

When a cherry-pick continues without a "todo script", the intention is
simply to pick a single commit.

However, when an interactive rebase is continued without a "todo
script", it means that the last command has been completed and that we
now need to clean up.

This commit guards the revert/cherry-pick specific steps so that they
are not executed in rebase -i mode.

Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
 sequencer.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index 683b89f..7f017a8 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1859,22 +1859,25 @@ int sequencer_continue(struct replay_opts *opts)
                if (commit_staged_changes(opts))
                        return -1;
        }
-       if (!file_exists(get_todo_path(opts)))
+       else if (!file_exists(get_todo_path(opts)))
                return continue_single_pick();
        if (read_populate_opts(opts) ||
                        read_populate_todo(&todo_list, opts))
                return -1;
 
-       /* Verify that the conflict has been resolved */
-       if (file_exists(git_path_cherry_pick_head()) ||
-           file_exists(git_path_revert_head())) {
-               int ret = continue_single_pick();
-               if (ret)
-                       return ret;
+       if (!is_rebase_i(opts)) {
+               /* Verify that the conflict has been resolved */
+               if (file_exists(git_path_cherry_pick_head()) ||
+                   file_exists(git_path_revert_head())) {
+                       int ret = continue_single_pick();
+                       if (ret)
+                               return ret;
+               }
+               if (index_differs_from("HEAD", 0))
+                       return error_dirty_index(opts);
+               todo_list.current++;
        }
-       if (index_differs_from("HEAD", 0))
-               return error_dirty_index(opts);
-       todo_list.current++;
+
        res = pick_commits(&todo_list, opts);
        todo_list_release(&todo_list);
        return res;
-- 
2.10.0.rc2.102.g5c102ec