Merge branch 'fg/submodule-git-file-git-dir'

diff --git a/branch.c b/branch.c
index fecedd3b4635c79adcbe0e26613af079beff64d0..d8098762f62a9dfb991f64702d34047182cfa951 100644 (file)
--- 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;
@@ -245,4 +246,5 @@ void remove_branch_state(void)
        unlink(git_path("MERGE_MSG"));
        unlink(git_path("MERGE_MODE"));
        unlink(git_path("SQUASH_MSG"));
+       remove_sequencer_state(0);
 }