X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=025a97be0281b9fd3ccff2b36c03495b005ac4fe;hb=cd4c4e2481dd6fcb7ceb39242fa722993f8c0ab1;hp=fecedd3b4635c79adcbe0e26613af079beff64d0;hpb=0814d6e554c45636f41856cc2204abe2f661560c;p=git.git

diff --git a/branch.c b/branch.c
index fecedd3b4..025a97be0 100644
--- a/branch.c
+++ b/branch.c
@@ -3,6 +3,7 @@
 #include "refs.h"
 #include "remote.h"
 #include "commit.h"
+#include "sequencer.h"
 
 struct tracking {
 	struct refspec spec;
@@ -240,9 +241,11 @@ void create_branch(const char *head,
 void remove_branch_state(void)
 {
 	unlink(git_path("CHERRY_PICK_HEAD"));
+	unlink(git_path("REVERT_HEAD"));
 	unlink(git_path("MERGE_HEAD"));
 	unlink(git_path("MERGE_RR"));
 	unlink(git_path("MERGE_MSG"));
 	unlink(git_path("MERGE_MODE"));
 	unlink(git_path("SQUASH_MSG"));
+	remove_sequencer_state(0);
 }