Move code to clean up after a branch change to branch.c

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
2008-02-07 11:40:16 -05:00
parent 94a5728cfb
commit c369e7b805
3 changed files with 28 additions and 6 deletions
--- a/branch.c
+++ b/branch.c
@ -138,3 +138,11 @@ void create_branch(const char *head,
 	if (real_ref)
 		free(real_ref);
 }
+
+void remove_branch_state(void)
+{
+	unlink(git_path("MERGE_HEAD"));
+	unlink(git_path("rr-cache/MERGE_RR"));
+	unlink(git_path("MERGE_MSG"));
+	unlink(git_path("SQUASH_MSG"));
+}