From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Dec 2011 19:32:39 +0000 (-0800)
Subject: Merge branch 'jn/maint-sequencer-fixes' into maint
X-Git-Tag: v1.7.8.2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/770dd00ebdb67455f0490982f8619b927792b837?ds=inline;hp=-c

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
---

770dd00ebdb67455f0490982f8619b927792b837
diff --combined branch.c
index f85c438284,a6b6722e24..d7fd267b7e
--- a/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);
  }