Merge branch 'jn/maint-sequencer-fixes' into maint

* jn/maint-sequencer-fixes:
  revert: stop creating and removing sequencer-old directory
  Revert "reset: Make reset remove the sequencer state"
  revert: do not remove state until sequence is finished
  revert: allow single-pick in the middle of cherry-pick sequence
  revert: pass around rev-list args in already-parsed form
  revert: allow cherry-pick --continue to commit before resuming
  revert: give --continue handling its own function

diff --combined branch.c
index f85c438284d6b810617595971d7e3ec2e79e3120,a6b6722e24bc196a54be5ab1240e8932e53483e2..d7fd267b7ed189eaca02caf6628969b50169ec45
--- 1/branch.c
--- 2/branch.c
+++ b/branch.c
@@@ -3,7 -3,6 +3,6 @@@
  #include "refs.h"
  #include "remote.h"
  #include "commit.h"
- #include "sequencer.h"
  
  struct tracking {
        struct refspec spec;
@@@ -160,8 -159,7 +159,8 @@@ int validate_new_branchname(const char 
  
  void create_branch(const char *head,
                   const char *name, const char *start_name,
 -                 int force, int reflog, enum branch_track track)
 +                 int force, int reflog, int clobber_head,
 +                 enum branch_track track)
  {
        struct ref_lock *lock = NULL;
        struct commit *commit;
@@@ -176,8 -174,7 +175,8 @@@
                explicit_tracking = 1;
  
        if (validate_new_branchname(name, &ref, force,
 -                                  track == BRANCH_TRACK_OVERRIDE)) {
 +                                  track == BRANCH_TRACK_OVERRIDE ||
 +                                  clobber_head)) {
                if (!force)
                        dont_change_ref = 1;
                else
@@@ -249,5 -246,4 +248,4 @@@ void remove_branch_state(void
        unlink(git_path("MERGE_MSG"));
        unlink(git_path("MERGE_MODE"));
        unlink(git_path("SQUASH_MSG"));
-       remove_sequencer_state(0);
  }