summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:45 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:45 -0800
commitb8fc5abd73e2e81c396844c09e8003de320709e5 (patch)
tree3a96eb03f4853272dd9d0d170ccab6c8cf3db082 /branch.c
parentea4ef304870d2517ec177f92b000c744bd44cc0c (diff)
parentd596118d7a9b104db10e64b2680a30ea80f1439c (diff)
downloadgit-b8fc5abd73e2e81c396844c09e8003de320709e5.tar.gz
Merge branch 'jn/maint-sequencer-fixes'
* 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
Diffstat (limited to 'branch.c')
-rw-r--r--branch.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/branch.c b/branch.c
index a715a11749..c2e625f40c 100644
--- a/branch.c
+++ b/branch.c
@@ -3,7 +3,6 @@
#include "refs.h"
#include "remote.h"
#include "commit.h"
-#include "sequencer.h"
struct tracking {
struct refspec spec;
@@ -280,5 +279,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);
}